Fixed bug #55618 (use case-insensitive cert name matching)

rdlowrey · Julien Pauli · commit eaf107c07824 · 2015-01-21T11:22:33.000+01:00
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -4619,14 +4619,14 @@ int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stre
 			return FAILURE;
 		}
 
-		match = strcmp(cnmatch, buf) == 0;
+		match = strcasecmp(cnmatch, buf) == 0;
 		if (!match && strlen(buf) > 3 && buf[0] == '*' && buf[1] == '.') {
 			/* Try wildcard */
 
 			if (strchr(buf+2, '.')) {
 				char *tmp = strstr(cnmatch, buf+1);
 
-				match = tmp && strcmp(tmp, buf+2) && tmp == strchr(cnmatch, '.');
+				match = tmp && strcasecmp(tmp, buf+2) && tmp == strchr(cnmatch, '.');
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -4619,14 +4619,14 @@ int php_openssl_apply_verification_policy(SSL ssl, X509 peer, php_stream *stre`
`4619`	`4619`	`return FAILURE;`
`4620`	`4620`	`}`
`4621`	`4621`
`4622`		`- match = strcmp(cnmatch, buf) == 0;`
	`4622`	`+ match = strcasecmp(cnmatch, buf) == 0;`
`4623`	`4623`	`if (!match && strlen(buf) > 3 && buf[0] == '*' && buf[1] == '.') {`
`4624`	`4624`	`/* Try wildcard */`
`4625`	`4625`
`4626`	`4626`	`if (strchr(buf+2, '.')) {`
`4627`	`4627`	`char *tmp = strstr(cnmatch, buf+1);`
`4628`	`4628`
`4629`		`- match = tmp && strcmp(tmp, buf+2) && tmp == strchr(cnmatch, '.');`
	`4629`	`+ match = tmp && strcasecmp(tmp, buf+2) && tmp == strchr(cnmatch, '.');`
`4630`	`4630`	`}`
`4631`	`4631`	`}`
`4632`	`4632`