30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
|
From 19a44ffb7be91344550fa700830b8e62a73031ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anatol Belski <ab@php.net>
|
||
|
|
Date: Thu, 28 Feb 2019 12:48:47 +0100
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
---
|
||
|
|
ext/openssl/openssl.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
|
||
|
|
index 871a30c..7df5072 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;
|
||
|
|
--
|
||
|
|
2.1.4
|
||
|
|
|