diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-01-14 18:04:41 +0100 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-01-14 18:04:41 +0100 |
| commit | 80a337bba1ce3c08217a28c21f6e0ab32612ddef (patch) | |
| tree | b6c8770ab22594b2b2deaf72da7c6c57bd1d6b89 /ext | |
| parent | ef5862253480ee9f6be0dd4dc6c7d87b0a5cc935 (diff) | |
| parent | 0a766104599fcb285bb9542fa28d2f7baa3d8e16 (diff) | |
| download | php-git-80a337bba1ce3c08217a28c21f6e0ab32612ddef.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS
Fixed bug #55618 (use case-insensitive cert name matching)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 4a4ec6f67d..f5ac3375df 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4619,14 +4619,14 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre return FAILURE; } - match = strcmp(cnmatch, buf) == 0; + match = strcasecmp(cnmatch, buf) == 0; if (!match && strlen(buf) > 3 && buf[0] == '*' && buf[1] == '.') { /* Try wildcard */ if (strchr(buf+2, '.')) { char *tmp = strstr(cnmatch, buf+1); - match = tmp && strcmp(tmp, buf+2) && tmp == strchr(cnmatch, '.'); + match = tmp && strcasecmp(tmp, buf+2) && tmp == strchr(cnmatch, '.'); } } |