From 5203931e6f0174d0ad40ca4974e00c65754032db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 21 Apr 2022 12:55:29 +0200 Subject: [PATCH] Add minimal OpenSSL 3.0 patch --- .../0049-Add-minimal-OpenSSL-3.0-patch.patch | 33 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/0049-Add-minimal-OpenSSL-3.0-patch.patch diff --git a/debian/patches/0049-Add-minimal-OpenSSL-3.0-patch.patch b/debian/patches/0049-Add-minimal-OpenSSL-3.0-patch.patch new file mode 100644 index 0000000000..a9083709d1 --- /dev/null +++ b/debian/patches/0049-Add-minimal-OpenSSL-3.0-patch.patch @@ -0,0 +1,33 @@ +From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +Date: Thu, 21 Apr 2022 12:52:24 +0200 +Subject: Add minimal OpenSSL 3.0 patch + +--- + ext/openssl/openssl.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c +index aa819be..2fa74f2 100644 +--- a/ext/openssl/openssl.c ++++ b/ext/openssl/openssl.c +@@ -55,6 +55,10 @@ + #include + #include + #include ++#if PHP_OPENSSL_API_VERSION >= 0x30000 ++#include ++#include ++#endif + + /* Common */ + #include +@@ -1517,7 +1521,9 @@ PHP_MINIT_FUNCTION(openssl) + REGISTER_LONG_CONSTANT("PKCS7_NOSIGS", PKCS7_NOSIGS, CONST_CS|CONST_PERSISTENT); + + REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT); ++#ifdef RSA_SSLV23_PADDING + REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT); ++#endif + REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT); + diff --git a/debian/patches/series b/debian/patches/series index e6fba8771a..a1679a627c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,3 +46,4 @@ 0046-Show-packaging-credits.patch 0047-Allow-printing-credits-buffer-larger-than-4k.patch 0048-Don-t-close-the-credits-buffer-file-descriptor-too-e.patch +0049-Add-minimal-OpenSSL-3.0-patch.patch -- GitLab