From 95d8de414ccb2db9cae20ca24c445a86342acdc6 Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Fri, 24 Nov 2023 11:12:23 +0000
Subject: [PATCH] Use OpenSSL 3.2.0 on PHP 8.1+

---
 php-81/Dockerfile           | 2 +-
 php-82/Dockerfile           | 2 +-
 php-83/Dockerfile           | 2 +-
 tests/test_2_extensions.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 8e5f81aa..cce8ddde 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -104,7 +104,7 @@ RUN set -xe; \
 #   - curl
 #   - php
 RUN yum install -y perl-IPC-Cmd
-ENV VERSION_OPENSSL=3.0.12
+ENV VERSION_OPENSSL=3.2.0
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
 ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index cb2a0db3..d89079cb 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -104,7 +104,7 @@ RUN set -xe; \
 #   - curl
 #   - php
 RUN yum install -y perl-IPC-Cmd
-ENV VERSION_OPENSSL=3.0.12
+ENV VERSION_OPENSSL=3.2.0
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
 ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index 2ae63a7a..07918155 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -104,7 +104,7 @@ RUN set -xe; \
 #   - curl
 #   - php
 RUN yum install -y perl-IPC-Cmd
-ENV VERSION_OPENSSL=3.0.12
+ENV VERSION_OPENSSL=3.2.0
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
 ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
diff --git a/tests/test_2_extensions.php b/tests/test_2_extensions.php
index 101147fe..44bf9bb0 100644
--- a/tests/test_2_extensions.php
+++ b/tests/test_2_extensions.php
@@ -81,7 +81,7 @@
     // https://github.com/brefphp/aws-lambda-layers/issues/42
     'curl-http2' => defined('CURL_HTTP_VERSION_2'),
     // Make sure we are not using the default AL2 OpenSSL version (7.79)
-    'curl-openssl' => str_starts_with(curl_version()['ssl_version'], 'OpenSSL/1.1.1') || str_starts_with(curl_version()['ssl_version'], 'OpenSSL/3.0'),
+    'curl-openssl' => str_starts_with(curl_version()['ssl_version'], 'OpenSSL/1.1.1') || str_starts_with(curl_version()['ssl_version'], 'OpenSSL/3.2'),
     // Check that the default certificate file exists
     // https://github.com/brefphp/aws-lambda-layers/issues/53
     'curl-openssl-certificates' => file_exists(openssl_get_cert_locations()['default_cert_file']),