5 files changed, 27 insertions, 72 deletions
diff --git a/tests/openpgp/samplekeys/pqc-sample-1.key.asc b/tests/openpgp/samplekeys/pqc-sample-1.key.asc
index 984495514..8d6be223b 100644
--- a/tests/openpgp/samplekeys/pqc-sample-1.key.asc
+++ b/tests/openpgp/samplekeys/pqc-sample-1.key.asc
@@ -1,19 +1,10 @@
-sec   ed25519 2024-04-19 [SC]
-      652B01FF34D43EA62C5DC897E47CC8B150A7A02E
-      Keygrip = DC60E0AE48E0F14E8FD7C9C36E18C6651E99BA93
-uid           [ultimate] pqc-sample-1
-ssb   ky768_cv25519 2024-04-19 [E]
-      CF06288CAAAA850A8B5B2927C8C14C7F0A8906AAEA320DE12A0A15F8E8746216
-      Keygrip = 2F4CD0990D56D41A74456668469E3139A7960CD4,
-                8B2E1355C97C34E0AC1CBC9DFDF2526BFE8990A7
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mDMEZiJoTBYJKwYBBAHaRw8BAQdAXRqMb7YIKL7wQxGaHfl+OmpAjPPgzVb3T5Ui
 p7qs1Ry0DHBxYy1zYW1wbGUtMYiTBBMWCgA7AhsDBQsJCAcCAiICBhUKCQgLAgQW
 AgMBAh4HAheAFiEEZSsB/zTUPqYsXciX5HzIsVCnoC4FAmYnnBwACgkQ5HzIsVCn
 oC6AIQD/QRW5cK76Fmzo2L/a4BO8a/Ui2Euqp74iOLTYMTa0QikA/jz/8YWk+VJ8
-pFZkuPvkMpYFb8Mo+WtmTpyM7b26zQMEuQTVBWYiaHsdAAAEywMrZW4BB0BkOEEb
+pFZkuPvkMpYFb8Mo+WtmTpyM7b26zQMEuQTVBWbhPhAIAAAEywMrZW4BB0BkOEEb
 Lj6i6ki2gYYMLKU3l4xpByy9BKQAaeEiZg9vNwAABKAN6U9CAWW3lwH7JKdmkZDP
 KEDte5bksIjUWp20USEX45svsjdUF1tkRxz5XASAB4/QqGEdGaFZMDsmBj3qiHUs
 ACAMgZKih8J+1wfWuDAAbYIfnCbwUB+FZRhmwMrqSBx85Z0f0EVI4VxWXJXb5r0M
@@ -40,7 +31,7 @@ UWHAxTXe5jhq/Dqph2mw0JJ/y4W7eVG192NUVwskyTobJ3dx+rDI7LkyawcMUSTJ
 RrPlOmafxG/u1mjPKVXIeXTAQpvMzGqcBAuKk85J5A1MYHyyaQh3QrTUKIGeQ0xB
 dJcIFUroy1wcOFtgxQkAiotvFat/xb0g+3BJOb7hZKGAvNLAqQH6nzA1YzZXaSbi
 TjUWlIpyInZyWU7qd67pA4h4BBgWCgAgFiEEZSsB/zTUPqYsXciX5HzIsVCnoC4F
-AmYiaHsCGwwACgkQ5HzIsVCnoC4X2gD+K/GMuumoiRpDxEMHbzUfdc1lPBy55MNl
-3CPRl3Xqoy8A+gIt6w5h3qWdP0DrrkdQub3uQ+XGhdp7GQTgkltOzfsC
-=Zup3
+AmbhPhACGwwACgkQ5HzIsVCnoC4dJwEA9OBBxb4Hneb/bFNs0WzQhOsDXOwvGMGu
+Wv6vPYG/xOUA/3kuIK/+RhcSaUnvGfF202d7XrFxf+Ic8mt2VXshc4YP
+=5DXF
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/samplekeys/pqc-sample-2.key.asc b/tests/openpgp/samplekeys/pqc-sample-2.key.asc
index d803e0320..c3b066a47 100644
--- a/tests/openpgp/samplekeys/pqc-sample-2.key.asc
+++ b/tests/openpgp/samplekeys/pqc-sample-2.key.asc
@@ -1,19 +1,10 @@
-sec   ed25519 2024-04-19 [SC]
-      6BF41D6AC221F5223C2DEEE320E629089768AD93
-      Keygrip = F5DB116462B7BD2FA83A4453C4DFA2AE8604FB59
-uid           [ultimate] pqc-sample-2
-ssb   ky1024_cv448 2024-04-19 [E]
-      2D0F59CAFD12DBD9DF9EFD602D7E8F8C2121A5D1841174346D6C8FE8F9AA7683
-      Keygrip = 8F9ABF3E5BBFC50D168DD524EB8F7263E7B33859,
-                A1598F57316F7FEC3F946895E35A7D2EAE8D3A13
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mDMEZiJolRYJKwYBBAHaRw8BAQdA8MEfpjJQ4IvZ0OdmQX6l9OQ2a31gaSpEL3Hj
 fPsZ6uS0DHBxYy1zYW1wbGUtMoiTBBMWCgA7AhsDBQsJCAcCAiICBhUKCQgLAgQW
 AgMBAh4HAheAFiEEa/QdasIh9SI8Le7jIOYpCJdorZMFAmYnnDgACgkQIOYpCJdo
 rZNYHAD/WZ/YV3lqcLTOs3u6XSskKVlf4jxAI9/tzRfG8M7qXPkBAOHzfq/CWJss
-Y7Vzh/ZT7/96gNhj3wzjJyjMZ2pSXlEFuQZsBWYiaKsdAAAGYgMrZW8Bv15CvAi+
+Y7Vzh/ZT7/96gNhj3wzjJyjMZ2pSXlEFuQZsBWbhPv8IAAAGYgMrZW8Bv15CvAi+
 YvTXQBlvwYiNGPHRvW0h2sY8cmW+KJfxws5eniFAqjtlYg/g6i+0Q5UoIa0Flnpt
 MthJAAAGIHbnmUFbBMWwSNhnHFlDmnE0JjwYEnlxIylHqmbWbfE0duCsX4FzYxbT
 jo/JTgcUSzKFai93Jeock6bUwmaACPd7xBsWtHnzE1QqytbySKNAuXkIgLOHXUd3
@@ -48,8 +39,8 @@ JD5VRvtKFyUDdiOMuLNTX7ELdzpspheZNkkKy4KAVxp8NWVso1NSJ57aVc0SgWul
 HCqgcsKmKK8kzKi6vRk3V90WYVs0Cf3wRTkMQ0Z5Kg2LI5lpe8SFudhRAxbJr2a2
 oI50sTARhumaujq7XbaLyBcsjfZ3t4+mDyR7RdOxTTkWRZL1PeOatrSpbHlJlk8g
 TJGaV2tRX0v5u2q/zk3XtZaduOzj2jLOKYtXN5Pz5FJIsMvP9n15iHgEGBYKACAW
-IQRr9B1qwiH1Ijwt7uMg5ikIl2itkwUCZiJoqwIbDAAKCRAg5ikIl2itk36RAQCk
-efX2FiFvTEb/SmxMUxNdBXeWGGeAMH3nURRQ/Dz6wQEAlsPzv1lXH3zNLyuhoJrF
-lUaDFf52BzCT6VOhK7yR8Ac=
-=MDdc
+IQRr9B1qwiH1Ijwt7uMg5ikIl2itkwUCZuE+/wIbDAAKCRAg5ikIl2itk8NsAPoC
+4y5gEPq+jQY8LE/qYvhnL1CU86SkIfEf/y2WTFY6MQD9HZyucAZS7OFUGoPHuqXt
+3WbzN6ZoyiTVZZ3ac/OvSQM=
+=TmXr
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/samplekeys/pqc-sample-3.key.asc b/tests/openpgp/samplekeys/pqc-sample-3.key.asc
index 78f9a8f75..03ee79761 100644
--- a/tests/openpgp/samplekeys/pqc-sample-3.key.asc
+++ b/tests/openpgp/samplekeys/pqc-sample-3.key.asc
@@ -1,12 +1,3 @@
-pub   brainpoolP256r1 2024-04-23 [SC]
-      9F7DCCABC11EFE248F48CECD6F6570B33D05BDF8
-      Keygrip = A87B85D88DB8B2B5A62A9958C8F2878F49605D09
-uid                      pqc-sample-3
-sub   ky768_bp256 2024-04-23 [E]
-      B4707EA9BF0FF29F65190D779BE6064181208C59988A80BCD2B2177A9BBDFE22
-      Keygrip = D54E9B75C3541D95C45E430DAC9645E9FB62C668,
-                EAD718DCE3D2F33A20BFC8BA617844DEF3FFAF3A
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mFMEZiemDBMJKyQDAwIIAQEHAgMEMYAcvhEgnWVwWHLNvtjocYrevI9PRNaacSRP
@@ -14,7 +5,7 @@ iD7/9UZUezHcwLwNG/XelT2+EadT3Dub0525VdyjDB8lNfWctLQMcHFjLXNhbXBs
 ZS0ziJMEExMIADsCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AWIQSffcyr
 wR7+JI9Izs1vZXCzPQW9+AUCZiemUAAKCRBvZXCzPQW9+K6XAP9Y9gQJG6kAzNKX
 BxHST/UwcxvA92UBYeHesTIXpop4kgD/dOS9g2UWNAWPkW0/xiGMSuFBIyJOSjpL
-Ny73Fn0lmgG5BPsFZiemNx0AAATxCSskAwMCCAEBBwIDBJqA9MdJmuFAVvUdSdmJ
+Ny73Fn0lmgG5BPsFZuFAFAgAAATxCSskAwMCCAEBBwIDBJqA9MdJmuFAVvUdSdmJ
 nXtz2xvn7mLu6qR3x6H5b1XxGMwMD4n/I+Y2xPJ6xR9sVxgCYGaJqf2ZQNcX7tsH
 Au0AAASgRqPOi2Y6JstK/Fpe01pAWtOzpmtHqFmkWKxvG/NRhXUgnZHNIxF3feoa
 FNGW5QOIrHouJZkiH/Jpf1Ep/mpfxriasWZ6rXF5qZERy9h049GGmdvAOmAeguFg
@@ -41,8 +32,8 @@ GAuHj1vBQusVLklBHIwaszpWjkAbuCetTnt7BKiSNsQAsjMAaomnfMNi9fY9V3Fa
 hewIuxdTSPowWHbNOiglR6NQL9FKuFAEvrUOtsiy9eIX/whshkc/GzRnL7nL+mO+
 HbihPcdqnLMMb+oKJcgo2Ka2+3JVabiIaStG2uxTMyqa+bYbH8koUaAjM4Spc1uG
 8HagX0TJfaSRxpqthiLOx1MMC9E8qYuR5YvBIpfKLCs3zc5FXrWIeAQYEwgAIBYh
-BJ99zKvBHv4kj0jOzW9lcLM9Bb34BQJmJ6Y3AhsMAAoJEG9lcLM9Bb34tPABAIHU
-3sAgcUS47Plw8XlrX04941JkVaoE/RAGWm4OHAsbAP4hylj3DC0vrKwUkirkJEkY
-x4ISI2U8yiITrTcSWAKs9A==
-=6QFw
+BJ99zKvBHv4kj0jOzW9lcLM9Bb34BQJm4UAUAhsMAAoJEG9lcLM9Bb34imUA/2yT
+agrK8akUnyLSu0JckN42uWLdSfWv7wluszB65QYWAP9oVyk59eAmZuiTc5Zbb5Xa
+Pa0cOuzlPGzLZgjfBikj9w==
+=JNSh
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/samplekeys/pqc-sample-4.key.asc b/tests/openpgp/samplekeys/pqc-sample-4.key.asc
index e913f78da..13625b0cd 100644
--- a/tests/openpgp/samplekeys/pqc-sample-4.key.asc
+++ b/tests/openpgp/samplekeys/pqc-sample-4.key.asc
@@ -1,12 +1,3 @@
-pub   brainpoolP384r1 2024-04-23 [SC]
-      A8237D19988A8255E70D2566EC280D0923FB2DF7
-      Keygrip = 702F599E35E6E0BE68E6FDF25D887229D42780F7
-uid                      pqc-sample-4
-sub   ky1024_bp384 2024-04-23 [E]
-      FBCD76AC9908E094D22CAE2564C9CB50EC69AACF0E3AEC91AA115CE43C71DC81
-      Keygrip = 19C87B74004E9839F3D56992B0A9943BF90B56F7,
-                7C31A4A632A49C4E8B1C8CBA53976ADFF714510F
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mHMEZiemgxMJKyQDAwIIAQELAwMET5MYqqLjo9KNp29LO2t8yvqbd6Vx6aW//erC
@@ -15,7 +6,7 @@ HtUtFPqUL2CQyZiKpe6yNo4Z9nnitAxwcWMtc2FtcGxlLTSIswQTEwkAOxYhBKgj
 fRmYioJV5w0lZuwoDQkj+y33BQJmJ6aDAhsDBQsJCAcCAiICBhUKCQgLAgQWAgMB
 Ah4HAheAAAoJEOwoDQkj+y33WBIBfjsh0jq5dpbhgcJ+CWRSdbFUtLzm68BpuEbS
 Xk3Rzfu06NahW7N6My5sXZTtkblgfAF/el7MA1ezHITsTp0xC+qrl4LeU5qq3LjB
-AZ4vQZUYiparLFLGjgFydw//j4S/z8MPuQabBWYnprIdAAAGkQkrJAMDAggBAQsD
+AZ4vQZUYiparLFLGjgFydw//j4S/z8MPuQabBWbhQG4IAAAGkQkrJAMDAggBAQsD
 AwRy+w1aCgHlXCnp+4xcQlvfNxUNr6PFVseG4v754BGRnmg9vHcx0Sgf25eAxLf9
 d4UZhRa+IDPQZEi6fqOcK8txKLweCz+B8uc0Q05v6Wsp4ZxXtCPFAJE0AQzYf63K
 Y6EAAAYgmpoHkHgsf0p/UZNHd/vPflbGbCpWFYaA5CQZbSdJt9Yk/cmsK4kL+FlM
@@ -50,9 +41,9 @@ McwFBVTOphspZYp11NM9vJWvXlh8HsOyuOcX/oW409Qa5cRwDcxEnqZUkbVWhXkW
 hsubUel7GGcdkvGjVqMGAAHKsiBwcga0hepuC9hfU3Gd+jh2xlNAWMTCkTMCRMGa
 yHuUS2lFt3tEV3dy3chyfGAmDFsXtIGaLIAanRaNDuoDvKUCNrwg9piGzvsMaZS/
 JcHMCSCepTtsBPFflhPF0EZG0VFFeiBvCzXJpAzDeCsvhRdZ+TBAzAvJdUd8cii9
-fRQ12oBgfqsHyvk/P6/GI7RFiIjwWUnqmylyiI/UDz5uAJ+Mk16IlwQYEwkAIBYh
-BKgjfRmYioJV5w0lZuwoDQkj+y33BQJmJ6ayAhsMAAoJEOwoDQkj+y331g4BfiAE
-9eRbjyVlWhuHPFETqMyGnkaB8G2OmY96TMCORisMyhfk3ahwJ8BNS3XLI5+tnwF4
-iMv+X1/eMgtVY8DCDox4fw6kbDNvR+rR1CfkBMn/ewKKc0IZ5BuQE+ByzMw1ujk=
-=Ztpi
+fRQ12oBgfqsHyvk/P6/GI7RFiIjwWUnqmylyiI/UDz5uAJ+Mk16ImAQYEwkAIBYh
+BKgjfRmYioJV5w0lZuwoDQkj+y33BQJm4UBuAhsMAAoJEOwoDQkj+y336p0Bf0zF
+LZgIvg/AwgRiYd6YySUpblkLkoHTjP1bku93bPUtltDns4vvuD5ZGQr3TV1TaAF/
+dE1z8O4iirojQElu+IqEUyzowFFuEJEB63awUCFf+q4JKWTy0uaSBz4ox/lEewvg
+=44iT
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/samplekeys/pqc-sample-5.key.asc b/tests/openpgp/samplekeys/pqc-sample-5.key.asc
index 6da585015..cc61663ca 100644
--- a/tests/openpgp/samplekeys/pqc-sample-5.key.asc
+++ b/tests/openpgp/samplekeys/pqc-sample-5.key.asc
@@ -1,12 +1,3 @@
-pub   brainpoolP512r1 2024-04-23 [SC]
-      7B3986A550E5DB116054B4B42CBE157D37FDEC1D
-      Keygrip = A1ABFD89944870D04039D40C218EE127254AEEE9
-uid                      pqc-sample-5
-sub   ky1024_bp512 2024-04-23 [E]
-      CA44B5ED43D33290398C5D0983EE5EE4721EC5C680AEA12C2282451D3ED65F4F
-      Keygrip = 513906BEA5A40F25C9D6EBBCEF62D0784E7235A5,
-                6EC551A7895031EE4543A1C789E16E6A6C229CFC
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mJMEZifQzRMJKyQDAwIIAQENBAMEaBxujXDe9d7WCXlyZD7OolOOpso/n4fcHksn
@@ -16,8 +7,8 @@ uwmOA920DHBxYy1zYW1wbGUtNYjTBBMTCgA7FiEEezmGpVDl2xFgVLS0LL4VfTf9
 7B0FAmYn0M0CGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQLL4VfTf9
 7B3UcwH+JBipc+OsxxqdhGeoNrYUAmDL4NoXMAhkTYPa7Qwub48ThWz3GjFOCnqr
 dyfxBPrEjW5MjRarC2eomaWO7mGbbQH/VXLH4/pq2MGlrhpRfupidbWDmFtHH2NQ
-oXSACpYNSTAjuy72p9s4dYbMMWRl85qQxh+4PtmY5XgQXOfd0FFgF7kGuwVmJ9Dq
-HQAABrEJKyQDAwIIAQENBAMEbiaJbqyNPX8x8LV0Of/bwAeIQc73qamKsV9In+40
+oXSACpYNSTAjuy72p9s4dYbMMWRl85qQxh+4PtmY5XgQXOfd0FFgF7kGuwVm4UDP
+CAAABrEJKyQDAwIIAQENBAMEbiaJbqyNPX8x8LV0Of/bwAeIQc73qamKsV9In+40
 6dFeIFDq/KDNTHAh5eAY9gHux+3eGqzpWeoT+EFDhhSJ3VStqk/4bl/3XjzC6mRT
 cWB13ZCLlke0UlemSuiN05DXMlueMGmAJxazdDr+en5ESVr2JcPgCcWBxj40Ghai
 PQcAAAYgvndoszgAtYOXhBSWXsQ50ppBgGVbCli6QMucKdEAiKB9ZrR65hJLmGFW
@@ -53,9 +44,9 @@ KGs3ngt2NhQd0gtDomtrsuA6VvAI8IaM4rlAzxCPznlUwKG5M8wV/hVuLExOTty7
 oehxCOPP8khlVIqDjnYZMVslwmU0ZRWMrkaDqgNpaHDDlzWbEYyzeqhT1GzFsFrP
 28AQyJhChAcAk0CkeToFcYsOEulfqGhaITuFWbRAIbjDpFivgcJHZ3Wr8AFdv/gg
 QnyjBiZd6a4PSuR032J9zRZ66p+3pus/Ahukp4rhESdfE6ySPiOIuAQYEwoAIBYh
-BHs5hqVQ5dsRYFS0tCy+FX03/ewdBQJmJ9DqAhsMAAoJECy+FX03/ewdgGQB/3hG
-AN5CHePZ4HY9ijl6NtptnzotFl0upj+ItZGsQAd+VroLkPI3Mk0HBecsWplYniS5
-ccBhUFTxlrDpPUXziHgB/0OtCd8cWWJtDOKs2rqdGxb+wfGKYmpOfELMIM6xkh43
-xYAjT76qD4Ht7Hf8tXBLJ3sYfcR2CCSQlDmoXrEUdFg=
-=qQEJ
+BHs5hqVQ5dsRYFS0tCy+FX03/ewdBQJm4UDPAhsMAAoJECy+FX03/ewdpvUB/Axd
+Qo+22moHQJbxCGQcytFz0LwJhqsEDgB/R25IwKC5D5y43Q6Gj3zEXG74yOdlkflU
+roLhXPMVe1Nwo0W2ensB/Atw23uYsQ1eMC+tebpQ4mq3Uphp4JSRqU0zsGw3XK4+
+YcN6b+SlKB06L+GoFvSvxv2lq7/SWLIl+PhEtDrPqQE=
+=C1jo
 -----END PGP PUBLIC KEY BLOCK-----