Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

php rebuild

Browse Source
This commit is contained in:
Rmys
2024-12-24 15:31:19 +03:00
parent 955adbd53b
commit 64ff57fe22
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/php/php/files/openssl3.patch
+37
View File
@@ -0,0 +1,37 @@
From fc7f5eaf4446feeec3e58caadc6bad4133b9e626 Mon Sep 17 00:00:00 2001
From: amidevous <amidevous@users.noreply.github.com>
Date: Mon, 6 Nov 2023 11:08:20 +0100
Subject: [PATCH] Update openssl.c
---
ext/openssl/openssl.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index aa819be422..65a3500b49 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -55,6 +55,10 @@
#include <openssl/rand.h>
#include <openssl/ssl.h>
#include <openssl/pkcs12.h>
+#if PHP_OPENSSL_API_VERSION >= 0x30000
+#include <openssl/core_names.h>
+#include <openssl/param_build.h>
+#endif
/* Common */
#include <time.h>
@@ -1515,9 +1519,11 @@ PHP_MINIT_FUNCTION(openssl)
REGISTER_LONG_CONSTANT("PKCS7_NOATTR", PKCS7_NOATTR, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PKCS7_BINARY", PKCS7_BINARY, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PKCS7_NOSIGS", PKCS7_NOSIGS, CONST_CS|CONST_PERSISTENT);
-
+#ifdef RSA_SSLV23_PADDING
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
+
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);
programming/php/php/pspec.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<Dependency>keyutils</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">int_overflow_in_mt_rand.patch</Patch> -->
<Patch level="1">openssl3.patch</Patch>
<!-- <Patch level="1">stack_buffer_overflow_in_imagepstext.patch</Patch> -->
<!-- <Patch level="1">denial_of_service_in_getArchiveComment.patch</Patch> -->
<!-- <Patch level="1">php-imap-myrights.diff</Patch> -->