Skip to content

Commit d56e255

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fixed bug #80368
2 parents 877fa6b + f4e1768 commit d56e255

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/openssl/openssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6886,7 +6886,8 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
68866886
int cipher_mode = EVP_CIPHER_mode(cipher_type);
68876887
memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
68886888
switch (cipher_mode) {
6889-
#if PHP_OPENSSL_API_VERSION >= 0x10100
6889+
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
6890+
/* Note: While OpenSSL 1.1 supports OCB mode, LibreSSL does not support it. */
68906891
case EVP_CIPH_GCM_MODE:
68916892
case EVP_CIPH_OCB_MODE:
68926893
case EVP_CIPH_CCM_MODE:

0 commit comments

Comments
 (0)