summaryrefslogtreecommitdiffstats
path: root/src/mbedTLS++/X509Cert.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/mbedTLS++/X509Cert.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbedTLS++/X509Cert.cpp b/src/mbedTLS++/X509Cert.cpp
index 4dd998f00..7bcfec415 100644
--- a/src/mbedTLS++/X509Cert.cpp
+++ b/src/mbedTLS++/X509Cert.cpp
@@ -30,7 +30,10 @@ cX509Cert::~cX509Cert()
int cX509Cert::Parse(const void * a_CertContents, size_t a_Size)
{
- return mbedtls_x509_crt_parse(&m_Cert, reinterpret_cast<const unsigned char *>(a_CertContents), a_Size);
+ // mbedTLS requires that PEM-encoded data is passed including the terminating NUL byte,
+ // and DER-encoded data is decoded properly even with an extra trailing NUL byte, so we simply add one to everything:
+ AString certContents(reinterpret_cast<const char *>(a_CertContents), a_Size);
+ return mbedtls_x509_crt_parse(&m_Cert, reinterpret_cast<const unsigned char *>(certContents.data()), a_Size + 1);
}