summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/crypto/x509.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/crypto/x509.c b/src/crypto/x509.c
index 3261b8eb6..356b60a36 100644
--- a/src/crypto/x509.c
+++ b/src/crypto/x509.c
@@ -575,6 +575,15 @@ static int x509_parse_common_name ( struct x509_certificate *cert, char **name,
if ( ! *name )
return -ENOMEM;
memcpy ( *name, name_cursor.data, name_cursor.len );
+
+ /* Check that name contains no NULs */
+ if ( strlen ( *name ) != name_cursor.len ) {
+ DBGC ( cert, "X509 %p contains malicious commonName:\n",
+ cert );
+ DBGC_HDA ( cert, 0, raw->data, raw->len );
+ return rc;
+ }
+
return 0;
}