From: Ilia Alshanetsky Date: Mon, 14 Sep 2009 12:50:30 +0000 (+0000) Subject: Fixed certificate validation inside php_openssl_apply_verification_policy X-Git-Tag: php-5.2.11~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d4871f5781929207f8bc161ecea605435e7e3f2;p=php Fixed certificate validation inside php_openssl_apply_verification_policy --- diff --git a/NEWS b/NEWS index 48c076a6de..8c99f45899 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Sep 2009, PHP 5.2.11 +- Fixed certificate validation inside php_openssl_apply_verification_policy + (Ryan Sleevi, Ilia) 10 Sep 2009, PHP 5.2.11RC3 - Updated timezone database to version 2009.13 (2009m) (Derick) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 6c8aefa2fe..9e4fc2785f 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3845,8 +3845,15 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre GET_VER_OPT_STRING("CN_match", cnmatch); if (cnmatch) { int match = 0; + int name_len = X509_NAME_get_text_by_NID(name, NID_commonName, buf, sizeof(buf)); - X509_NAME_get_text_by_NID(name, NID_commonName, buf, sizeof(buf)); + if (name_len == -1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate peer certificate CN"); + return FAILURE; + } else if (name_len != strlen(buf)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Peer certificate CN=`%.*s' is malformed", name_len, buf); + return FAILURE; + } match = strcmp(cnmatch, buf) == 0; if (!match && strlen(buf) > 3 && buf[0] == '*' && buf[1] == '.') { @@ -3861,10 +3868,7 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre if (!match) { /* didn't match */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Peer certificate CN=`%s' did not match expected CN=`%s'", - buf, cnmatch); - + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Peer certificate CN=`%.*s' did not match expected CN=`%s'", name_len, buf, cnmatch); return FAILURE; } }