From: Anatol Belski <ab@php.net>
Date: Thu, 28 Feb 2019 11:48:47 +0000 (+0100)
Subject: Sync with behavior change in OpenSSL 1.1.1b
X-Git-Tag: php-7.3.4RC1~52^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19a44ffb7be91344550fa700830b8e62a73031ba;p=php

Sync with behavior change in OpenSSL 1.1.1b

A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 871a30c82a..7df50720eb 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -6494,7 +6494,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;