Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6

rdlowrey · rdlowrey · commit 1de1ff75f516 · 2015-03-04T22:55:22.000-07:00
* 'PHP-5.6' of https://github.com/bjori/php-src: hexadecimal is case*in*sensitive
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -275,7 +275,7 @@ static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *
 	int result = -1;
 
 	if (php_openssl_x509_fingerprint(peer, method, 0, &fingerprint, &fingerprint_len TSRMLS_CC) == SUCCESS) {
-		result = strcmp(expected, fingerprint);
+		result = strcasecmp(expected, fingerprint);
 		efree(fingerprint);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static int php_x509_fingerprint_cmp(X509 peer, const char method, const char *`
`275`	`275`	`int result = -1;`
`276`	`276`
`277`	`277`	`if (php_openssl_x509_fingerprint(peer, method, 0, &fingerprint, &fingerprint_len TSRMLS_CC) == SUCCESS) {`
`278`		`- result = strcmp(expected, fingerprint);`
	`278`	`+ result = strcasecmp(expected, fingerprint);`
`279`	`279`	`efree(fingerprint);`
`280`	`280`	`}`
`281`	`281`