Update openssl pgp keys and versions

> The current releases are signed by the OpenSSL key with fingerprint BA54 73A2 B058 7B07 FB27 CF2D 2160 94DF D0CB 81EF. > > https://openssl-library.org/source/
docker-library · Sep 5, 2024 · fd645d8 · fd645d8
1 parent 8049e56
commit fd645d8
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 96 deletions.
diff --git a/3.12/alpine/Dockerfile b/3.12/alpine/Dockerfile
diff --git a/3.12/ubuntu/Dockerfile b/3.12/ubuntu/Dockerfile
diff --git a/3.13/alpine/Dockerfile b/3.13/alpine/Dockerfile
diff --git a/3.13/ubuntu/Dockerfile b/3.13/ubuntu/Dockerfile
diff --git a/4.0-rc/alpine/Dockerfile b/4.0-rc/alpine/Dockerfile
diff --git a/4.0-rc/ubuntu/Dockerfile b/4.0-rc/ubuntu/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -22,42 +22,14 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
 
 ENV OPENSSL_VERSION {{ .openssl.version }}
 ENV OPENSSL_SOURCE_SHA256="{{ .openssl.sha256 }}"
-# https://www.openssl.org/community/otc.html
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="{{
 [
-	# Dmitry Belyavsky
-
-	# Matt Caswell
-	"8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491",
-
-	# Paul Dale
-	"B7C1 C143 60F3 53A3 6862 E4D5 231C 84CD DCC6 9C45",
-
-	# Tim Hudson
-	"C1F3 3DD8 CE1D 4CC6 13AF 14DA 9195 C482 41FB F7DD",
-
-	# Hugo Landau
-	"95A9 908D DFA1 6830 BE9F B900 3D30 A3A9 FF13 60DC",
-
-	# Richard Levitte
-	"7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C",
-
-	# Shane Lontis
-
-	# Tomas Mraz
-	"A21F AB74 B008 8AA3 6115 2586 B8EF 1A6B A9DA 2D5C",
-
-	# Kurt Roeckx
-	"E5E5 2560 DD91 C556 DDBD A5D0 2064 C536 41C2 5E5D",
-
-	# Matthias St. Pierre
-
-	# Nicola Tuveri
-
-	# OpenSSL OMC key
-	# https://github.com/openssl/web/pull/415
-	"EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5",
+	# "OpenSSL <openssl@openssl.org>"
+	# https://openssl-library.org/source/index.html
+	# "The current releases are signed by the OpenSSL key with fingerprint:"
+	# https://keys.openpgp.org/search?q=openssl%40openssl.org
+	"BA54 73A2 B058 7B07 FB27 CF2D 2160 94DF D0CB 81EF",
 
 	# hack for trailing comma above
 	empty

diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template
@@ -25,42 +25,14 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
 
 ENV OPENSSL_VERSION {{ .openssl.version }}
 ENV OPENSSL_SOURCE_SHA256="{{ .openssl.sha256 }}"
-# https://www.openssl.org/community/otc.html
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="{{
 [
-	# Dmitry Belyavsky
-
-	# Matt Caswell
-	"8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491",
-
-	# Paul Dale
-	"B7C1 C143 60F3 53A3 6862 E4D5 231C 84CD DCC6 9C45",
-
-	# Tim Hudson
-	"C1F3 3DD8 CE1D 4CC6 13AF 14DA 9195 C482 41FB F7DD",
-
-	# Hugo Landau
-	"95A9 908D DFA1 6830 BE9F B900 3D30 A3A9 FF13 60DC",
-
-	# Richard Levitte
-	"7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C",
-
-	# Shane Lontis
-
-	# Tomas Mraz
-	"A21F AB74 B008 8AA3 6115 2586 B8EF 1A6B A9DA 2D5C",
-
-	# Kurt Roeckx
-	"E5E5 2560 DD91 C556 DDBD A5D0 2064 C536 41C2 5E5D",
-
-	# Matthias St. Pierre
-
-	# Nicola Tuveri
-
-	# OpenSSL OMC key
-	# https://github.com/openssl/web/pull/415
-	"EFC0 A467 D613 CB83 C7ED 6D30 D894 E2CE 8B3D 79F5",
+	# "OpenSSL <openssl@openssl.org>"
+	# https://openssl-library.org/source/index.html
+	# "The current releases are signed by the OpenSSL key with fingerprint:"
+	# https://keys.openpgp.org/search?q=openssl%40openssl.org
+	"BA54 73A2 B058 7B07 FB27 CF2D 2160 94DF D0CB 81EF",
 
 	# hack for trailing comma above
 	empty

diff --git a/versions.json b/versions.json
@@ -4,8 +4,8 @@
       "version": "3.20"
     },
     "openssl": {
-      "sha256": "5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7",
-      "version": "3.1.6"
+      "sha256": "053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c",
+      "version": "3.1.7"
     },
     "otp": {
       "sha256": "00c2619648e05a25b39035ea51b65fc79c998e55f178cccc6c1b920f3f10dfba",
@@ -22,8 +22,8 @@
       "version": "3.20"
     },
     "openssl": {
-      "sha256": "5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7",
-      "version": "3.1.6"
+      "sha256": "053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c",
+      "version": "3.1.7"
     },
     "otp": {
       "sha256": "e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872",
@@ -40,8 +40,8 @@
       "version": "3.20"
     },
     "openssl": {
-      "sha256": "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e",
-      "version": "3.3.1"
+      "sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281",
+      "version": "3.3.2"
     },
     "otp": {
       "sha256": "e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872",