diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-21 12:56:12 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-21 12:56:12 +0200 |
| commit | e7ef2b52db67da9794527d9ffa882f2e4e1dcd22 (patch) | |
| tree | 3f087322b3a6c43ff7ff1bd9a28b01b527a55132 /ext/openssl | |
| parent | e1e8e670df7784bd873c09a55bf08cd7465704c5 (diff) | |
| parent | 414db07bdb49062ae5350407669ef868226af630 (diff) | |
| download | php-git-e7ef2b52db67da9794527d9ffa882f2e4e1dcd22.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index caf812d83d..85f2ebca59 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -449,6 +449,8 @@ static zend_bool php_openssl_matches_san_list(X509 *peer, const char *subject_na if (php_openssl_matches_wildcard_name(subject_name, (const char *)cert_name)) { OPENSSL_free(cert_name); + sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free); + return 1; } OPENSSL_free(cert_name); @@ -461,6 +463,8 @@ static zend_bool php_openssl_matches_san_list(X509 *peer, const char *subject_na san->d.iPAddress->data[3] ); if (strcasecmp(subject_name, (const char*)ipbuffer) == 0) { + sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free); + return 1; } } @@ -471,6 +475,8 @@ static zend_bool php_openssl_matches_san_list(X509 *peer, const char *subject_na } } + sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free); + return 0; } /* }}} */ |