summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTjerk Meesters <datibbaw@php.net>2014-07-24 14:40:30 +0800
committerTjerk Meesters <datibbaw@php.net>2014-07-24 14:40:30 +0800
commit4b410090645cf73278be790ab54644d24e611184 (patch)
treea6b8550a02e79df0df10a717930d8f505ba072d2
parent8fb7c4dc08c9d4eeb891be47b63b5b717bb61c45 (diff)
parentaab23cf38e51c0e4a12cefb62f20c27f16e6740e (diff)
downloadphp-git-4b410090645cf73278be790ab54644d24e611184.tar.gz
Merge branch 'PHP-5.6'
-rw-r--r--ext/openssl/xp_ssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 9fbbb6de56..0b4e3d5c21 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -323,7 +323,7 @@ static zend_bool matches_san_list(X509 *peer, const char *subject_name TSRMLS_DC
if (san_name_len != strlen((const char*)cert_name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Peer SAN entry is malformed");
} else {
- is_match = strcasecmp(subject_name, (const char*)cert_name) == 0;
+ is_match = matches_wildcard_name(subject_name, (const char *)cert_name);
}
OPENSSL_free(cert_name);