Skip to content

Commit f126769

Browse files
committed
Fix bug GH-9517: Compilation error in openssl extension
1 parent e9a0d21 commit f126769

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ PHP NEWS
1010
. Fixed bug GH-9259 (opcache.interned_strings_buffer setting integer
1111
overflow). (Arnaud)
1212

13+
- OpenSSL:
14+
. Fixed bug GH-9517 (Compilation error openssl extension related to PR
15+
GH-9366). (Jakub Zelenka)
16+
1317
- PDO_PGSQL:
1418
. Fixed bug GH-9411 (PgSQL large object resource is incorrectly closed).
1519
(Yurunsoft)

ext/openssl/openssl.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7163,14 +7163,14 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
71637163
/* Since OpenSSL 1.1, all AEAD ciphers use a common framework. We check for
71647164
* EVP_CIPH_OCB_MODE, because LibreSSL does not support it. */
71657165
case EVP_CIPH_GCM_MODE:
7166+
case EVP_CIPH_CCM_MODE:
71667167
# ifdef EVP_CIPH_OCB_MODE
71677168
case EVP_CIPH_OCB_MODE:
7168-
# endif
7169-
case EVP_CIPH_CCM_MODE:
7170-
php_openssl_set_aead_flags(mode);
71717169
/* For OCB mode, explicitly set the tag length even when decrypting,
71727170
* see https://github.com/openssl/openssl/issues/8331. */
71737171
mode->set_tag_length_always = cipher_mode == EVP_CIPH_OCB_MODE;
7172+
# endif
7173+
php_openssl_set_aead_flags(mode);
71747174
mode->set_tag_length_when_encrypting = cipher_mode == EVP_CIPH_CCM_MODE;
71757175
mode->is_single_run_aead = cipher_mode == EVP_CIPH_CCM_MODE;
71767176
break;

0 commit comments

Comments
 (0)