NIT CS

vesvault-jz · vesvault-jz · commit cd853e6a1b1f · 2018-04-04T16:48:37.000-04:00
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -4958,8 +4958,8 @@ PHP_FUNCTION(openssl_pkey_derive)
 	if (keylen < 0) {
 		php_error_docref(NULL, E_WARNING, "keylen < 0, assuming NULL");
 	}
-	if ((pkey = php_openssl_evp_from_zval(priv_key,0,"",0,0,NULL)) == NULL
-		|| (peer_key = php_openssl_evp_from_zval(peer_pub_key,1,NULL,0,0,NULL)) == NULL) {
+	if ((pkey = php_openssl_evp_from_zval(priv_key, 0, "", 0, 0, NULL)) == NULL
+		|| (peer_key = php_openssl_evp_from_zval(peer_pub_key, 1, NULL, 0, 0, NULL)) == NULL) {
 		RETURN_FALSE;
 	}
 	EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pkey, NULL);

Original file line number	Diff line number	Diff line change
`@@ -4958,8 +4958,8 @@ PHP_FUNCTION(openssl_pkey_derive)`
`4958`	`4958`	`if (keylen < 0) {`
`4959`	`4959`	`php_error_docref(NULL, E_WARNING, "keylen < 0, assuming NULL");`
`4960`	`4960`	`}`
`4961`		`- if ((pkey = php_openssl_evp_from_zval(priv_key,0,"",0,0,NULL)) == NULL`
`4962`		`- \|\| (peer_key = php_openssl_evp_from_zval(peer_pub_key,1,NULL,0,0,NULL)) == NULL) {`
	`4961`	`+ if ((pkey = php_openssl_evp_from_zval(priv_key, 0, "", 0, 0, NULL)) == NULL`
	`4962`	`+ \|\| (peer_key = php_openssl_evp_from_zval(peer_pub_key, 1, NULL, 0, 0, NULL)) == NULL) {`
`4963`	`4963`	`RETURN_FALSE;`
`4964`	`4964`	`}`
`4965`	`4965`	`EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pkey, NULL);`