summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2019-02-28 12:48:47 +0100
committerAnatol Belski <ab@php.net>2019-03-08 15:47:32 +0100
commit66bd861fcd2a508d5321d8a3be6158f5026aafc6 (patch)
tree93d4304cbe25f5534af711cb3dd5e7ce9d247ef1
parentb6308f5b48a21da53150af35855912f3ac55e94a (diff)
downloadphp-git-66bd861fcd2a508d5321d8a3be6158f5026aafc6.tar.gz
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. (cherry picked from commit 19a44ffb7be91344550fa700830b8e62a73031ba)
-rw-r--r--ext/openssl/openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 44fe00b7fe..39b6a20473 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -6339,7 +6339,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;