Merge branch 'PHP-7.2' into PHP-7.3

weltling · weltling · commit 58d3dd466f2b · 2019-02-28T12:52:28.000+01:00
* PHP-7.2:
  Sync with behavior change in OpenSSL 1.1.1b
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -6546,7 +6546,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
 {
 	int i = 0;
 
-	if (mode->is_single_run_aead && !EVP_EncryptUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
+	if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
 		php_openssl_store_errors();
 		php_error_docref(NULL, E_WARNING, "Setting of data length failed");
 		return FAILURE;

Original file line number	Diff line number	Diff line change
`@@ -6546,7 +6546,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,`
`6546`	`6546`	`{`
`6547`	`6547`	`int i = 0;`
`6548`	`6548`
`6549`		`- if (mode->is_single_run_aead && !EVP_EncryptUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {`
	`6549`	`+ if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {`
`6550`	`6550`	`php_openssl_store_errors();`
`6551`	`6551`	`php_error_docref(NULL, E_WARNING, "Setting of data length failed");`
`6552`	`6552`	`return FAILURE;`