php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source
This commit is contained in:
Nikita Popov
2019-06-21 12:56:12 +02:00
parent e1e8e670df 414db07bdb
commit e7ef2b52db
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/openssl/xp_ssl.c
View File

@@ -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;
}
/* }}} */