mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Merge branch 'PHP-7.3' into PHP-7.4
This commit is contained in:
commit
e7ef2b52db
@ -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;
|
||||
}
|
||||
/* }}} */
|
||||
|
Loading…
Reference in New Issue
Block a user