Merge branch 'PHP-7.3' into PHP-7.4

weltling · weltling · commit a5e986181aed · 2019-02-28T12:53:05.000+01:00
* PHP-7.3:
  Sync with behavior change in OpenSSL 1.1.1b
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -6605,7 +6605,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
`@@ -6605,7 +6605,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,`
`6605`	`6605`	`{`
`6606`	`6606`	`int i = 0;`
`6607`	`6607`
`6608`		`- if (mode->is_single_run_aead && !EVP_EncryptUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {`
	`6608`	`+ if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {`
`6609`	`6609`	`php_openssl_store_errors();`
`6610`	`6610`	`php_error_docref(NULL, E_WARNING, "Setting of data length failed");`
`6611`	`6611`	`return FAILURE;`