diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-30 15:17:35 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-30 15:17:35 +0100 |
| commit | 4ce33486d7739cc6fd410eca8f524981fc22aad5 (patch) | |
| tree | f14a2aa63ef542a6b643d99e501101c1a61d6a24 | |
| parent | e42bf726c051d5367484b45fe18b06e3d7d783c9 (diff) | |
| parent | 32cd5a1bc8616435e50445ec43e157ca4bb10e4c (diff) | |
| download | php-git-4ce33486d7739cc6fd410eca8f524981fc22aad5.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Next attempt to fix bug #80368
| -rw-r--r-- | ext/openssl/openssl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index b4404bb1f1..effc659b68 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -6886,8 +6886,9 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c int cipher_mode = EVP_CIPHER_mode(cipher_type); memset(mode, 0, sizeof(struct php_openssl_cipher_mode)); switch (cipher_mode) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - /* Note: While OpenSSL 1.1 supports OCB mode, LibreSSL does not support it. */ +#ifdef EVP_CIPH_OCB_MODE + /* Since OpenSSL 1.1, all AEAD ciphers use a common framework. We check for + * EVP_CIPH_OCB_MODE, because LibreSSL does not support it. */ case EVP_CIPH_GCM_MODE: case EVP_CIPH_OCB_MODE: case EVP_CIPH_CCM_MODE: |