Skip to content

Commit 0f579fd

Browse files
committed
Fixed bug #80368
We assume that usually LibreSSL supports everything OpenSSL 1.1 does. In this instance, this is not the case.
1 parent 5240f83 commit 0f579fd

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ PHP NEWS
2020
- Intl:
2121
. Fixed bug #80425 (MessageFormatAdapter::getArgTypeList redefined). (Nikita)
2222

23+
- OpenSSL:
24+
. Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
25+
lack of OCB support). (Nikita)
26+
2327
- Standard:
2428
. Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb)
2529
. Fixed bug #80411 (References to null-serialized object break serialize()).

ext/openssl/openssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6496,7 +6496,8 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
64966496
int cipher_mode = EVP_CIPHER_mode(cipher_type);
64976497
memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
64986498
switch (cipher_mode) {
6499-
#if PHP_OPENSSL_API_VERSION >= 0x10100
6499+
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
6500+
/* Note: While OpenSSL 1.1 supports OCB mode, LibreSSL does not support it. */
65006501
case EVP_CIPH_GCM_MODE:
65016502
case EVP_CIPH_OCB_MODE:
65026503
case EVP_CIPH_CCM_MODE:

0 commit comments

Comments
 (0)