com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c

From: Date: Thu, 05 Mar 2015 06:00:59 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85237@lists.php.net to get a copy of this message
Commit: fe29b8134cbacf6ca07e948be4fe66813817cdad Author: Daniel Lowrey <rdlowrey@php.net> Wed, 4 Mar 2015 23:00:59 -0700 Parents: 94a70b98a65db700192258addfa627101bbd86c5 1de1ff75f516d6a4124fa7408b92f7470452fa74 Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=fe29b8134cbacf6ca07e948be4fe66813817cdad Log: Merge branch 'PHP-5.6' * PHP-5.6: hexadecimal is case*in*sensitive Conflicts: ext/openssl/xp_ssl.c Changed paths: MM ext/openssl/xp_ssl.c Diff: diff --cc ext/openssl/xp_ssl.c index 20ebda2,4786974..3fad16e --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@@ -306,15 -268,15 +306,15 @@@ static int verify_callback(int preverif } /* }}} */ -static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *expected TSRMLS_DC) +static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *expected) { - char *fingerprint; - int fingerprint_len; + zend_string *fingerprint; int result = -1; - if (php_openssl_x509_fingerprint(peer, method, 0, &fingerprint, &fingerprint_len TSRMLS_CC) == SUCCESS) { - result = strcasecmp(expected, fingerprint); - efree(fingerprint); + fingerprint = php_openssl_x509_fingerprint(peer, method, 0); + if (fingerprint) { - result = strcmp(expected, fingerprint->val); ++ result = strcasecmp(expected, fingerprint->val); + zend_string_release(fingerprint); } return result;

« previous php.cvs (#85237) next »