chore(deps): bump openssl to 3.4.0

Kong · Jan 14, 2025 · 06df242 · 06df242
1 parent f68de81
commit 06df242
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 23 deletions.
diff --git a/.requirements b/.requirements
@@ -4,8 +4,8 @@ OPENRESTY=1.25.3.2
 OPENRESTY_SHA256=2d564022b06e33b45f7e5cfaf1e5dc571d38d61803af9fa2754dfff353c28d9c
 LUAROCKS=3.11.1
 LUAROCKS_SHA256=c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102
-OPENSSL=3.2.3
-OPENSSL_SHA256=52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239
+OPENSSL=3.4.0
+OPENSSL_SHA256=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
 PCRE=10.44
 PCRE_SHA256=86b9cb0aa3bcb7994faa88018292bc704cdbb708e785f7c74352ff6ea7d3175b
 ADA=2.9.2

diff --git a/changelog/unreleased/kong/bump_openssl.yml b/changelog/unreleased/kong/bump_openssl.yml
@@ -0,0 +1,3 @@
+message: "Bumped OpenSSL to 3.4.0."
+type: dependency
+scope: Core
diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt
@@ -206,7 +206,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt
@@ -179,7 +179,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt
@@ -203,7 +203,7 @@
   - lua-resty-events
   - lua-resty-lmdb
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/debian-11-amd64.txt b/scripts/explain_manifest/fixtures/debian-11-amd64.txt
@@ -180,7 +180,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/debian-12-amd64.txt b/scripts/explain_manifest/fixtures/debian-12-amd64.txt
@@ -169,7 +169,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/el8-amd64.txt b/scripts/explain_manifest/fixtures/el8-amd64.txt
@@ -190,7 +190,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/el9-amd64.txt b/scripts/explain_manifest/fixtures/el9-amd64.txt
@@ -179,7 +179,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/el9-arm64.txt b/scripts/explain_manifest/fixtures/el9-arm64.txt
@@ -203,7 +203,7 @@
   - lua-resty-events
   - lua-resty-lmdb
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt
@@ -184,7 +184,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt
@@ -173,7 +173,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt
@@ -190,7 +190,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt
@@ -173,7 +173,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt b/scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt
@@ -190,7 +190,7 @@
   - lua-resty-lmdb
   - ngx_brotli
   - ngx_wasmx_module
-  OpenSSL   : OpenSSL 3.2.3 3 Sep 2024
+  OpenSSL   : OpenSSL 3.4.0 22 Oct 2024
   DWARF     : True
   DWARF - ngx_http_request_t related DWARF DIEs: True
 

diff --git a/scripts/explain_manifest/suites.py b/scripts/explain_manifest/suites.py
@@ -95,14 +95,14 @@ def common_suites(expect, libxcrypt_no_obsolete_api: bool = False, skip_libsimdj
         expect("/usr/local/openresty/nginx/sbin/nginx", "nginx should link libxcrypt.so.1") \
             .needed_libraries.contain("libcrypt.so.1")
 
-    expect("/usr/local/openresty/nginx/sbin/nginx", "nginx compiled with OpenSSL 3.2.x") \
-        .nginx_compiled_openssl.matches(r"OpenSSL 3.2.\d") \
-        .version_requirement.key("libssl.so.3").less_than("OPENSSL_3.3.0") \
-        .version_requirement.key("libcrypto.so.3").less_than("OPENSSL_3.3.0") \
-
-    expect("**/*.so", "dynamic libraries are compiled with OpenSSL 3.2.x") \
-        .version_requirement.key("libssl.so.3").less_than("OPENSSL_3.3.0") \
-        .version_requirement.key("libcrypto.so.3").less_than("OPENSSL_3.3.0") \
+    expect("/usr/local/openresty/nginx/sbin/nginx", "nginx compiled with OpenSSL 3.4.x") \
+        .nginx_compiled_openssl.matches(r"OpenSSL 3.4.\d") \
+        .version_requirement.key("libssl.so.3").less_than("OPENSSL_3.5.0") \
+        .version_requirement.key("libcrypto.so.3").less_than("OPENSSL_3.5.0") \
+
+    expect("**/*.so", "dynamic libraries are compiled with OpenSSL 3.4.x") \
+        .version_requirement.key("libssl.so.3").less_than("OPENSSL_3.5.0") \
+        .version_requirement.key("libcrypto.so.3").less_than("OPENSSL_3.5.0") \
 
     ADA_VERSION = read_requirements()["ADA"]
     expect("**/*.so", "ada version is less than %s" % ADA_VERSION) \