diff options
| author | Anatol Belski <ab@php.net> | 2019-02-28 12:53:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-02-28 12:53:05 +0100 |
| commit | a5e986181aedcb0fa96fa0e3e03d4484176579fb (patch) | |
| tree | 0e0bcf9f80d211dd878bf38dd72a7223171ed17d | |
| parent | a0b527eb33a5aa50d85e1dc2e5e6d7c32d771109 (diff) | |
| parent | 58d3dd466f2b0031e28bce4e27e4141685f9c9c4 (diff) | |
| download | php-git-a5e986181aedcb0fa96fa0e3e03d4484176579fb.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Sync with behavior change in OpenSSL 1.1.1b
| -rw-r--r-- | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index f6555b415c..13e660d49a 100644 --- 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; |