6 files changed, 82 insertions, 9 deletions
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index d9ee5189433e..fa5a7eb62149 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-openssl/Manifest b/sec-keys/openpgp-keys-openssl/Manifest
index 183618c0adb2..97a6c2d02a62 100644
--- a/sec-keys/openpgp-keys-openssl/Manifest
+++ b/sec-keys/openpgp-keys-openssl/Manifest
@@ -7,6 +7,14 @@ DIST openssl-keys-20221101-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLA
 DIST openssl-keys-20221101-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
 DIST openssl-keys-20221101-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD.asc 1534 BLAKE2B b572d5893a44f120b5ddec55d96d53cb5bd490e563253906f597fb8253c198f0fa318a955b4f30db3b93565ea87e0e423db661de17253fc2255843513a86b6b6 SHA512 359acc73f14e9c6ba68729b234f0bc94d67bc16eec7a18bb641bdfc8d51e19c2afa96292e99c97308ebce4bb5e4aa040beabba051f08b42fca242dff2e99b7f7
 DIST openssl-keys-20221101-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
+DIST openssl-keys-20230207-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc 3050 BLAKE2B 5c785d9ed3019865fac34a0b7647ddadda30ceaed57a711c32483a1309b2160209a50b89bc9a01a1696b691999e27808ef2a44e94242478e388d963b8a2c13b4 SHA512 583a32254ea46b89e348ad14f22a784920b6ca3c75b9bd681298be94e5d367a6beedf4b320212ddd5509881e1bc88a643680c9ff2829d7a529d3f27956e2e086
+DIST openssl-keys-20230207-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc 5302 BLAKE2B 30ec164d0022c432747063e8aac63d51ba44d3f1096925376aed00d8b843835d891b01e2b4b46abd0e4567b4108ea96266a2a8949508e4767632bc01cf3901c2 SHA512 724a2ba71404c7bcb7aa6ec5ab6fe91b50c3294dc1b0791a369554505c812a142879a05663d098447f20a7383e039dcf4e0699740c4ab0ba4393c891e237bcc0
+DIST openssl-keys-20230207-8657ABB260F056B1E5190839D9C4D26D0E604491.asc 1531 BLAKE2B 7333259523feb8e79c00c8f0652544471abfc087ebbe149eed2413f8e55637fdb3138d39885a88aafecd7b8edda207542198dc2deba8a882253fd91cd5ab0ace SHA512 e3f9b5a77124fbecef6c37a1d4fe8292ccc3210eabf60d6349f704d22014dd4d3343e40dc26c65659297e2a713ddbec52662924ae93468a6e0e9709f724944a7
+DIST openssl-keys-20230207-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc 3505 BLAKE2B 10e4a6970366dd6c2b2633da3045cf3da0857b1ea1f84b40bf0b85b0424583030593d3eb85bab06fe9b1dcbaa7c4c5c7023cb8a5d82d9340b0741601b6a79deb SHA512 154f173c316cff4c325746de3c6c992f1a493315958bcfb6b9c273edb9921d78f8c5febb69d6e8a743d89427aacc181e90ccc8098deb97295c2c6b258867be96
+DIST openssl-keys-20230207-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc 5194 BLAKE2B e8bb04c8590ec2171f024c49439bbae04690f14db4dfac20ddc43d963659d2b3788dcd34105f8c987b0413cd5803222cdbaf5ca3b7ec8808eb43c3a8bf23da8f SHA512 fe14c26a3075019d9c876f23550d3c897b5773f4ce92d68cb578d2a266557bf00ced11a91d048d2e2448f0c453651f61faa42eb1608d9d0faed8ddd03ead7ec4
+DIST openssl-keys-20230207-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLAKE2B a9913d00635a73636dae7ea30bf16ade55a8f56d6fa3a804ebaf736705cfb3628b4838289c9b9847d1809da94dd4c9c23d01fe0521701dd164ff5036cfa78ec3 SHA512 c7927ff7643ac4aa12f516103d76af4c56e25f3d3a3d4064ec5d11f30d9447899b18c22cfb7217488b2e5b912220269e78668655343db52f486d29788e4759fc
+DIST openssl-keys-20230207-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
 EBUILD openpgp-keys-openssl-20220316-r1.ebuild 946 BLAKE2B 6b8ac9655a53640847401483270e68c1841f91c1c29fac69c8a40298854881d02306ab5c9725230e622f64cf6c642276bc8bc797f682bbfacb202c871d7ff81e SHA512 c6efc3cbee447ba2e3d3708b0c3a68787d475458a57f7c3f3d0743a72e259f8c517054678d01ea764c5fe59b6a745bbcdc45cb81e47978a28f20fcf30ce71341
-EBUILD openpgp-keys-openssl-20221101.ebuild 1879 BLAKE2B 4f5752ddb775d2f4d7e346e6bc5d3125593146d58c1b059ec649c042d62d57f1793bfd5d4a3263eec58f97360bc3dc96eebfcf5e871d09c992955d92f29edc93 SHA512 7d6b9632bd1271eb8f3bc38a615713708d042f2ea65cc5010980943ca12e7d26cc6a539b77a54f2b0c8c65ad0dc0df3ef62ae4f27888c8bc023851b06db6b7a1
+EBUILD openpgp-keys-openssl-20221101.ebuild 1924 BLAKE2B d78a943602a99aa0c18c7537f58cbe2f41050ba006135714a893a88802f8b62d7aaeb20b8ac5dfede4395f64c27783123a5b49f37fda993ef97be4b9968690a8 SHA512 92c3cc7beae6d76daa8ba5354704be45108ed0c9b89c267ac14858d20edce786a4f26449783b0319b1c2c9b873d367567a99271105c742fb423cc57ad7d3cc84
+EBUILD openpgp-keys-openssl-20230207.ebuild 1953 BLAKE2B 393623d201f03323b39b0f7c9b9eb2a05d9590cdbd228bdc8e9b6fcbb12751ba6673c337708cd5a75d867cbf139ec2b44a5350b1804ed17f1c72c2086660377b SHA512 43762438c4c8c4c39c96156197bd451c742dc4d596885000106caf4fc91caa3df8dce9a28c29c46e9adc33c02bf4e433e58852cf865bea817b21caf0545e5dea
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
index 31738282d033..1df7f769b9e4 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,11 +12,11 @@ HOMEPAGE="https://www.openssl.net/"
 # - https://www.openssl.org/community/omc.html
 # Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491 etc (unstable results)
 # ```
-# gpg --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
+# gpg --no-default-keyring --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
 #
-#for key in "${OSSL_FINGERPRINTS[@]}" ; do
-#	gpg --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
-#done
+# for key in "${OSSL_FINGERPRINTS[@]}" ; do
+#  gpg --no-default-keyring --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
+# done
 # ```
 #
 # https://github.com/openssl/openssl/issues/19566
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
new file mode 100644
index 000000000000..f4f965bc9856
--- /dev/null
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by OpenSSL"
+HOMEPAGE="https://www.openssl.net/"
+
+# See the following:
+# - https://www.openssl.org/source/
+# - https://www.openssl.org/community/otc.html
+# - https://www.openssl.org/community/omc.html
+# Mirrored from https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8657ABB260F056B1E5190839D9C4D26D0E604491 etc (unstable results)
+# ```
+# mkdir /tmp/tmp-gpg
+# gpg --no-default-keyring --homedir=/tmp/tmp-gpg --keyserver keyserver.ubuntu.com --recv-keys "${OSSL_FINGERPRINTS[@]}" || exit 1
+#
+# for key in "${OSSL_FINGERPRINTS[@]}" ; do
+#  gpg --no-default-keyring --homedir=/tmp/tmp-gpg --export "${key}" > openssl-keys-20221101-${key}.asc
+# done
+# ```
+#
+# https://github.com/openssl/openssl/issues/19566
+# https://github.com/openssl/openssl/issues/19567
+
+OSSL_FINGERPRINTS=(
+	# Matt Caswell <matt@openssl.org>
+	5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33
+
+	# Paul Dale <pauli@openssl.org>
+	8657ABB260F056B1E5190839D9C4D26D0E604491
+
+	# Tim Hudson <tjh@openssl.org>
+	B7C1C14360F353A36862E4D5231C84CDDCC69C45
+
+	# Hugo Landau <hlandau@openssl.org>
+	95A9908DDFA16830BE9FB9003D30A3A9FF1360DC
+
+	# Tomas Mraz <tomas@openssl.org>
+	A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C
+
+	# Richard Levitte <levitte@openssl.org>
+	7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
+
+	# Kurt Roeckx <kurt@openssl.org>
+	E5E52560DD91C556DDBDA5D02064C53641C25E5D
+)
+
+ossl_key=
+for ossl_key in "${OSSL_FINGERPRINTS[@]}" ; do
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/openssl-keys-${PV}-${ossl_key}.asc"
+done
+unset ossl_key
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - openssl.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-yubico/Manifest b/sec-keys/openpgp-keys-yubico/Manifest
index e05fd45d802e..797e9f792166 100644
--- a/sec-keys/openpgp-keys-yubico/Manifest
+++ b/sec-keys/openpgp-keys-yubico/Manifest
@@ -10,5 +10,5 @@ DIST yubico-8D0B4EBA9345254BCEC0E843514F078FF4AB24C3.asc 22919 BLAKE2B 067364f6b
 DIST yubico-9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1.asc 13110 BLAKE2B 84d6e1ce46f1565045fbeebc16c40a42c118f0241c131545f9ebb1978e97a51d2ae2f72016d927f52af2fedeba70411b43574be9bc17f062bb20ad6f74790937 SHA512 2a87b0bafebde8e893ecbc119cff7ed705d6691a40945a95a1a690046d0a4a743dd885ab768b280b8d8c33f12870ef11c4589a2196fc59c9537a5e82b7bc2b62
 DIST yubico-AF511D2CBC0F973E5D308054325C8E4AE2E6437D.asc 7004 BLAKE2B 47dcba04cbb6043531d780931380b6fe85c6399049c85ff9b9a92f258f4b3e8bd11afdf28fbb395b25d9f19d98de01ac870db6369c4f94f816042e4a604cfd9b SHA512 9398e7b684958d88bf02588be592978622343c4c4ba9cfdc9a789a397cdb7834b343832825255919fc96d58057326ed13d41453171bb2fc8384fe6421178d71e
 DIST yubico-B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A.asc 36922 BLAKE2B b3de3c3ea8e90fe507339191ec8cbf2b2b730982e3ddd57d04f2e46fcf6652172d0a301da08e39357185039be2bd793008f5bf2588f6d34fa9a387069fd5a2fa SHA512 d304dbcf9c27bc2ef36d770a6c99c6d97996f989644323a988ef80e020bf0b98d4a15ef315cdddd8aad0644153a098c9ced36153d285a80220c717a97b65d04f
-EBUILD openpgp-keys-yubico-20220824.ebuild 3006 BLAKE2B 0382b120d0888ebc973e1ad1e320b40f3ebd86638439e806b59844783a0af04748ff2b528e02a67abba39f2cef4f2275fdef217c0a2af9b9c4f45934b65238c9 SHA512 246e9b72f6295887d3ae9ba3a15c154befe5ee5dcaefcbea6861ef548e759394cee81f4cd45e69c245bec3b6e7ab0794e67b5c5e2f27f3ca2957ff9dbf749ac0
+EBUILD openpgp-keys-yubico-20220824.ebuild 3004 BLAKE2B ed38ef9d0df6e19664892e58bb55814fcddcfacfc808d2e9925188647bbf95a57822b46cdc66e4f6c5d072c02e4bb3fa2d04583a7f3e619ea763125d8ad5e436 SHA512 c7e278abebd33f80ba6996e10b0c986efdf18dfee695ec365cd3aff331643a8004dcdcf6ecad84ec616f7548c8deffcaf1173ad38f45a2fcb73d83573bd7cab3
 MISC metadata.xml 270 BLAKE2B d90b48ed01ae5992ffbc202f3986e25094317fad7487f19dd94522a125654901ab9530e2e968019e914fca406b14128723d976f4135fbaca04a2b940e153a225 SHA512 1227df9b05e8c78e076c45e582f308979de96289b537eeaf49eec613d0149ea62fbed862310b6496f39af5d935039c64d5fedc9ba82be4023cbe6c9b44a61dc5
diff --git a/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild b/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
index 012ce84ae3bb..c4fe050d9f88 100644
--- a/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
+++ b/sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )