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-----
diff --git a/tests/openpgp/samplemsgs/pqc-sample-1.enc.asc b/tests/openpgp/samplemsgs/pqc-sample-1.enc.asc
index c07b46fb4..7210821e4 100644
--- a/tests/openpgp/samplemsgs/pqc-sample-1.enc.asc
+++ b/tests/openpgp/samplemsgs/pqc-sample-1.enc.asc
@@ -1,81 +1,87 @@
 -----BEGIN PGP MESSAGE-----
 
-hQSaA88GKIyqqoUKHQEA0pRJ6Vj5C0XlgpwLd18OLgMMQJ9nw68AA2f/tCrZBVcA
-AARAdHv1SfxOewaAWAp79c8vesQ1ToGOeM/2l8LXhbCB67f5RFkdJVl9yY1WyTpz
-IHnlynbB53sNvoS2re+fKySS7fj9nE6n7+RF+NNkS3z7aSPUaJ71Yk3tYZDP+mLd
-45g4eqj8O7hpwgS0bCq4a35Oq41dNS7g2S9psgdlC7BGRnzVwPh1v5jF7PTb9WdQ
-2GCmvR4Mo87McT5YLv0GNg51aYbx6iD2clcuhBEKx85E+DMnU7+BWqC/Ly+It8d8
-/gPQha7y4ZMkfNlaHSJtcmOqS9gDek+auLYFUqfrvxo8Kmza7bdsRiN8OeP+o/06
-tPNnRkeOp94jbwUjoIbTlZn55qYD0w5FX7yfZPgfUYqEHT+R5zYU1ow3hmt+18zz
-L0bpk+GsCEfSyNHlx9R7W5MTvhjP32Xki/UZKy/4WcqiqZQbqJ7KxpE9ATl9XE+/
-5BzmMbVzdaeOgulOJiLxsvZxFhXTVWYJJMtYExzC1jRw4sic8t/PWy1sPE6un9PZ
-oBXOMSnbF2sVFueuFGH7thUI2ZI4oUBV9fM8SDUgHuw6oC3VCOtBuCJ5r6uA7ZaP
-i8U0CULEHX0sS8SHoL+QIdfG6MHM0w9zNk1d6LhVvlwyGuyHuBDjNJRoJz3URnIc
-UvUC2s60tytiuZLLuMZlUooxcDC+Fp5k2ejNP5AWfT1LQUMdV8vRGKiWaL1PbY1M
-96PqA3NDZyd9MJn3o74MEA19HPRNTInTW0xwWejZty6hTLvrBMpZSaTxFwmUuUdb
-81LES4AkeWH4SJxS8xse2dlD2JK2tYYZPGgkgj5BIAT3J4/Cy9hgdls5NFPZDNUe
-cXxz1LRPvewWxjmv7X5H6niBeHCOHXYXYbUTHw8/acDt/HEjYo6yBu3C7MXn5Ga6
-FvC9XWZAQTiicU6cF7U6/TQWQqZWhrdPyWD9/x3iUr4mJsOl3RBBT3Koz7Tyo41H
-RqweL+sCYf1tmgIUsLRVZBVOR1JNRkuW4PL0jBR/rsvDWBQShjFvWb8DiKXhm7pK
-1DSpMhiuV2BQuVnMls3aw40V9TPaq/dxqj9U/LIRW2vR9sza3ulS7UWL0ZbgLMjz
-hq0nU1XRqstTExGwlokt8TJGfsX15yIllLt6iajXD5kiTzhS2iuuXYq4Fx/LjRoQ
-W1VglExBdfy0hjFWQMoKZ0f6SjfoIdqKDZDZ1ygKB4UJW0UE0Wmhq5imY1ih/Jb3
-CR5ksXqp4QDr1oCOo4ZtDANGDOyAWAGxsBW0tRMTqcS1J5LT8RKf6wsti14EFOtp
-d/fNUvFz5RMYKdDkRb4V14iwgCsGCpShOyDorN+g4Lya3gEIKfG4Qlkg+J6N426L
-jwE1Jxx4S+sMzFii7bUQr+Pu9efh95V2Vg6JbccurqCKsOF2ksqE+1AsZiLYFqIL
-Qvj7OTbHwvKmNMBfWmCNOew/ggNeYXrXK5X4q9qQuHgFNrwJKNaSc4qft/0JJ0yF
-wBctVCPMUvkdYeCCAvSTAhek9bpOiYJgrIl6Fa3UcwEJAhCQ0BoXGut4xmSZnufk
-LZNiq7jAIbyXKcGjfUYJkv4ryEYfk+9fMM6HHXnz5wHKLb5xQMQCioJxQuZIY8ku
-p2ioOSIHLnVQg9Q9KKdt4RNpvV59Ca+PDBUXGH8167Fp+oKkix7etYsMEamXnlPg
-Hto=
-=/vwC
+hQSaAxksSLmqss30CAD6AwdaVdhqVBZL5yH1zTed8YNBc6libg9fuYaEKqVgDBAA
+AARAiAhSw9WPh6E68g0/+nIhBJGcy1wHCfPgq53oHmsbrWqKUxK9BQN6ANmNUI4B
+3VfjzKgWZuvry/IotlDQKMJurSWon6XnLUquf8mO5q5kcqntMh3lUBAHz92zYdA0
+pvAuQ2hxXm9t2fxApOLsis5cs7G9dYy3eE9F74eyqvkHYX7fa3bLwcpdeAduKJNg
+9RLjBAHmRVK5EA8eydytSB+TVeWM7D5DmOXWDUVMdonRFYJZEzYjsf9sOPI6DT3v
+VL5d1iiMopTTaJJ374lG9NSWByx3dVXQ+DQUCyJh43J8CJb/w9R5cZJUymawQHmt
+P0SlAh5+NhSrnPz5ilfeOlzy9zpObHYv2wmcc1OCb3R9g2KUI6uCGWX3/mN6tijQ
+Qnpeqmp774MFLxBPeo9xQW4unl3xxX6sd3lwFHuiru0WVEbhyNpNZJ9U86+esKvj
+3DkbY/Z4hj6+47dpQOZ1HZALAanMcJHpR7yyY0zERRvl3OXGZvzq4UCw4SelmDp4
+LAINu2SBDSkkS9kkOp2kLg5prz63GJRDmqhhBzCyLJG6zMmM2l0dT5FtZyZo+SJ7
+klAwZ1FrlZ4OHst/m3FCzJywMcDKdx0gcAyx6JR18ewPLaBhB4KVnlqe1kp6IXBC
+kI7nlSoS/Knn/nhIvNoM2OxzJIrPIBGZxWBpV3h2/kO/7swsnzBkilUdQG2isWOw
+rtsPALf0p82UzF9Ww7ws4AMbjHqUD/QCouax6laNhaTDrfjnJg+lkIX/qHJOacCq
+n9AnPhOB9GxJwGX9OROFPpcCe2jTvk4gWYiDMrRMdhz9UkanIEUbHQRpBaHP90pF
+twDuiCF7kFYHOjJlhWopppWn3xYARR1OII7prJULwtnVTI0k9suF63B9Am5xYSNN
+WuHhDsZQ4zDSTC6V9lXmC8uS1G6YHX6s6IWfZQS784UB8QxWDhNuRcltD7NB5BK3
+S1yx5tjEp3tq3DhXKefIA9gSBhy4m2+5fN67eQ61u3k+p5JNOS+FQMmm7wPaXCar
+ESyA2AcAlBnPHqx/fCURtVFRF91QhcN0Nr71jabsLw55KO6TLCB74BYEm1a3fkac
+xxYFGdDSudLe4rftBGGRNlNbkbtZU5OujX9VUUdQzI9ZAco9zjfITzcZXIjP+t/q
+UilIEKPnJmSH3kgppdz4lTj1DgeUorcOwrtHJN0AD1ZuSXfHewlhFXvVfAlKdmgE
+sJ9q38btnJm8Bf8IfyETdmmlq4qemOI7W/TxFrX7/6axotPopHCSb0xSfbavNO2H
+KTa4U5VWgeQ6RkgmG/zC2Jq4dioUuJ2nnBTlpikMmazkTT6yiLiv3WQu0Bxolukl
+LsFZNvj9biO5TnURcHL2fv+YtcQ9hV9PsBqWXJsNig3imCudHD80rOIQQRAwaBRr
+vAbJUmcYiuV6jMJfPnvUbTq1vQFB3M4s7Yfk9IOGWaB3BGoJKPqPUHTf88fVoYBe
+y5AsQrPuJHY4W6xjhDahKU/em2RvkqOS0AClQFrUiAEJAhBLR1+R+FOX1gK0u4sI
+HMoHdpIduUXb338IXqblLWLoKHVfh+wSv90kagqjIJnPppNFksRHImWhXjhCwLwP
+Z1EkA9BIr+/JfeWJbTYz3WSbRiV3d6KdzxpAB0DsDUZQXvyYTIiNSan6JB8/HqHr
+xrFflA8yA4Y5dhtnQYhsmnzwcMbUSWk=
+=BGtZ
 -----END PGP MESSAGE-----
 
 Created with key:
 
-sec   ed25519 2024-04-19 [SC] [expires: 2027-04-19]
+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
+ssb   ky768_cv25519 2024-09-11 [E]
+      192C48B9AAB2CDF46DE86DA3500078C0021261E61F17DD355FA853CAC428D719
+      Keygrip = 2F4CD0990D56D41A74456668469E3139A7960CD4,
+                8B2E1355C97C34E0AC1CBC9DFDF2526BFE8990A7
 
 Encryption with --debug=crypto diagnostics:
 
-DEK is:  85ae7493cfbafdd7282332dbf539ae7c54257c86de776fa29466378e92a110b2
-encode_session_key: encoding 32 byte DEK
-encode_session_key: [32] 85  ae 74 ...  a1 10 b2
-ECC    curve: 1.3.101.110
-ECC   pubkey: 6438411b2e3ea2ea48b681860c2ca537978c69072cbd04a40069e122660f6f37
-ecc_mul_point info: Montgomery/Standard
-ecc_mul_point name: Curve25519
-ecc_mul_point    p:+7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed
-ecc_mul_point    a:+01db41
-ecc_mul_point    b:+01
-ecc_mul_point  g.X:+09
-ecc_mul_point  g.Y:+5f51e65e475f794b1fe122d388b72eb36dc2b28192839e4dd6163a5d81312c14
-ecc_mul_point  g.Z:+01
-ecc_mul_point    n:+1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
-ecc_mul_point    h:+08
-ecc_mul_point info: Montgomery/Standard
-ecc_mul_point name: Curve25519
-ecc_mul_point    p:+7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed
-ecc_mul_point    a:+01db41
-ecc_mul_point    b:+01
-ecc_mul_point  g.X:+09
-ecc_mul_point  g.Y:+5f51e65e475f794b1fe122d388b72eb36dc2b28192839e4dd6163a5d81312c14
-ecc_mul_point  g.Z:+01
-ecc_mul_point    n:+1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
-ecc_mul_point    h:+08
-ECC    ephem: d29449e958f90b45e5829c0b775f0e2e030c409f67c3af000367ffb42ad90557
-ECC     ecdh: 2444b6e1183eae269c6d4d9f28cd6de1cfedf6bed90ce6dd7ea732d9503cb32b
-ECC   shared: 6648e8f006898d6407cc253f6a6c47b638f5ff00c5994580b6272611a8d9ad9e
-Kyber pubkey: 0de94f420165b79701fb24a7669190cf2840ed7b96e4b088d45a9db4512117e3 …
-Kyber  ephem: 747bf549fc4e7b0680580a7bf5cf2f7ac4354e818e78cff697c2d785b081ebb7 …
-Kyber shared: 0495e20570cd29d82a4933b8a133c09c39ec2a4e67aa6119cf7eccf2bf74ed40
-KEK: 4aee18ac1e35f67b8e3f5109695831fa77b426d85ed11b74390faed49f65da9e
-seskey: 85ae7493cfbafdd7282332dbf539ae7c54257c86de776fa29466378e92a110b2
-enc_seskey: 28d692738a9fb7fd09274c85c0172d5423cc52f91d61e08202f4930217a4f5ba \
-            4e898260ac897a15ad
-Kyber/AES256.OCB encrypted for: "CF06288CAAAA850A pqc-sample-1"
+gpg: DBG: DEK is:  0f837a7d56a548e17861243caf9d330b12fbecfee3e26c03a22c6868d47330e5
+gpg: DBG: encode_session_key: encoding 32 byte DEK
+gpg: DBG: encode_session_key: [32] 0f  83 7a ...  73 30 e5
+gpg: DBG: ECC    curve: 1.3.101.110
+gpg: DBG: ECC   pubkey: 6438411b2e3ea2ea48b681860c2ca537978c69072cbd04a40069e122660f6f37
+gpg: DBG: ecc_mul_point info: Montgomery/Standard
+gpg: DBG: ecc_mul_point name: Curve25519
+gpg: DBG: ecc_mul_point    p:+7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed
+gpg: DBG: ecc_mul_point    a:+01db41
+gpg: DBG: ecc_mul_point    b:+01
+gpg: DBG: ecc_mul_point  g.X:+09
+gpg: DBG: ecc_mul_point  g.Y:+5f51e65e475f794b1fe122d388b72eb36dc2b28192839e4dd6163a5d81312c14
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
+gpg: DBG: ecc_mul_point    h:+08
+gpg: DBG: ecc_mul_point info: Montgomery/Standard
+gpg: DBG: ecc_mul_point name: Curve25519
+gpg: DBG: ecc_mul_point    p:+7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed
+gpg: DBG: ecc_mul_point    a:+01db41
+gpg: DBG: ecc_mul_point    b:+01
+gpg: DBG: ecc_mul_point  g.X:+09
+gpg: DBG: ecc_mul_point  g.Y:+5f51e65e475f794b1fe122d388b72eb36dc2b28192839e4dd6163a5d81312c14
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+1000000000000000000000000000000014def9dea2f79cd65812631a5cf5d3ed
+gpg: DBG: ecc_mul_point    h:+08
+gpg: DBG: ECC    ephem: 03075a55d86a54164be721f5cd379df1834173a9626e0f5fb986842aa5600c10
+gpg: DBG: ECC     ecdh: 37e862a72fe4a385c5df321f5d850d3e609838f0885dc2fc632414488ea7a15c
+gpg: DBG: ECC   shared: c2b1666f2f0f279240b4412e3ef943603546b9e05381f102ea36fc424b2ddfc0
+gpg: DBG: Kyber pubkey: 0de94f420165b79701fb24a7669190cf2840ed7b96e4b088d45a9db4512117e3 …
+gpg: DBG: Kyber  ephem: 880852c3d58f87a13af20d3ffa722104919ccb5c0709f3e0ab9de81e6b1bad6a …
+gpg: DBG: Kyber shared: 1ad21090a31c25a7a9eaa0f8d83308f5c312d227e71d97938a9bcb3d291ba3c5
+gpg: DBG: KEK: 0fd6eb6ca9b16131d224a737a5f0768298d0fa34199c9c99c727d478c2d2c2cf
+gpg: DBG: seskey: 0f837a7d56a548e17861243caf9d330b12fbecfee3e26c03a22c6868d47330e5
+gpg: DBG: enc_seskey: 28fa8f5074dff3c7d5a1805ecb902c42b3ee2476385bac638436a1294fde9b64 \
+gpg: DBG:             6f92a392d000a5405a
+gpg: Kyber/AES256.OCB encrypted for: "192C48B9AAB2CDF4 pqc-sample-1"
+gpg: DBG: thekey: 0f837a7d56a548e17861243caf9d330b12fbecfee3e26c03a22c6868d47330e5
+gpg: DBG: nonce: 4b475f91f85397d602b4bb8b081cca
+gpg: DBG: authdata: d4010902100000000000000000
+gpg: DBG: nonce: 4b475f91f85397d602b4bb8b081ccb
+gpg: DBG: authdata: d40109021000000000000000010000000000000055
diff --git a/tests/openpgp/samplemsgs/pqc-sample-2.enc.asc b/tests/openpgp/samplemsgs/pqc-sample-2.enc.asc
index c4233ab45..84f0d9bd7 100644
--- a/tests/openpgp/samplemsgs/pqc-sample-2.enc.asc
+++ b/tests/openpgp/samplemsgs/pqc-sample-2.enc.asc
@@ -1,102 +1,109 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-=fcr5
+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
+GQ==
+=fbm6
 -----END PGP MESSAGE-----
 
 Created with key:
 
-sec   ed25519 2024-04-19 [SC] [expires: 2027-04-19]
+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
+ssb   ky1024_cv448 2024-09-11 [E]
+      F729750F28D72E48855DF3D1C4766470D02203068477BBE628B4261BA94D892D
+      Keygrip = 8F9ABF3E5BBFC50D168DD524EB8F7263E7B33859,
+                A1598F57316F7FEC3F946895E35A7D2EAE8D3A13
 
 Encryption with --debug=crypto diagnostics:
 
-DEK is:  244ab936bd8c02d89486abe92a5c145fb502099445987ed21ca78fa42e7f45ea
-encode_session_key: encoding 32 byte DEK
-encode_session_key: [32] 24  4a b9 ...  7f 45 ea
-ECC    curve: 1.3.101.111
-ECC   pubkey: 5e42bc08be62f4d740196fc1888d18f1d1bd6d21dac63c7265be2897f1c2ce5e \
-              9e2140aa3b65620fe0ea2fb443952821ad05967a6d32d849
-ecc_mul_point info: Montgomery/SafeCurve
-ecc_mul_point name: X448
-ecc_mul_point    p:+fffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff \
-                    ffffffffffffffffffffffffffffffffffffffffffffffff
-ecc_mul_point    a:+98a9
-ecc_mul_point    b:+01
-ecc_mul_point  g.X:+05
-ecc_mul_point  g.Y:+7d235d1295f5b1f66c98ab6e58326fcecbae5d34f55545d060f75dc28df3f6ed \
-                    b8027e2346430d211312c4b150677af76fd7223d457b5b1a
-ecc_mul_point  g.Z:+01
-ecc_mul_point    n:+3fffffffffffffffffffffffffffffffffffffffffffffffffffffff7cca23e9 \
-                    c44edb49aed63690216cc2728dc58f552378c292ab5844f3
-ecc_mul_point    h:+04
-ecc_mul_point info: Montgomery/SafeCurve
-ecc_mul_point name: X448
-ecc_mul_point    p:+fffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff \
-                    ffffffffffffffffffffffffffffffffffffffffffffffff
-ecc_mul_point    a:+98a9
-ecc_mul_point    b:+01
-ecc_mul_point  g.X:+05
-ecc_mul_point  g.Y:+7d235d1295f5b1f66c98ab6e58326fcecbae5d34f55545d060f75dc28df3f6ed \
-                    b8027e2346430d211312c4b150677af76fd7223d457b5b1a
-ecc_mul_point  g.Z:+01
-ecc_mul_point    n:+3fffffffffffffffffffffffffffffffffffffffffffffffffffffff7cca23e9 \
-                    c44edb49aed63690216cc2728dc58f552378c292ab5844f3
-ecc_mul_point    h:+04
-ECC    ephem: 1f774fa032dc2d041500d70400cea29dc246d89df9fee9c6c598996ef11c0005 \
-              f35b7d6cafbb57db8b88b1cd71e581b1f1c838cb5007bf51
-ECC     ecdh: b8993bc015a983286618ff6ce866ef846d4cca616934afd8f1ffef9d25046620 \
-              81bb9d8316a3ae5199720f27dcf4ac72fa9e1d71db9b1745
-ECC   shared: 634b233b4674df04158bf3b3eb287b50e10819aabaaaa9750e1c603c40b244e9 \
-              a0dd353e8098adbacd277f9d79bf2bdfb4ba4401d71b871272d20c99ee3b02c1
-Kyber pubkey: 76e799415b04c5b048d8671c59439a7134263c18127971232947aa66d66df134 …
-Kyber  ephem: bf2b37dd51251881092c7de9ee67e69de08b87f8f6fca812dad8d40005174f55 …
-Kyber shared: 8fd48c5489254e89bcea602904323a370050eee86240e171181e5d1602288aac
-KEK: 8595d1368fa33a7ba26810adfc1f66a688768e07c6610766d80d0dcffe1ff3c1
-seskey: 244ab936bd8c02d89486abe92a5c145fb502099445987ed21ca78fa42e7f45ea
-enc_seskey: 28093c2a75245fb24e16e2ae4bce22da587777136a4cd794f664fb7d35d45e7a \
-            e6cd3c5a831ef89377
-Kyber/AES256.OCB encrypted for: "2D0F59CAFD12DBD9 pqc-sample-2"
+gpg: DBG: DEK is:  0b1f8a442bff56df9a5fc23d5162993c455b2849ba1c430e1f0c0ce1ba49a3af
+gpg: DBG: encode_session_key: encoding 32 byte DEK
+gpg: DBG: encode_session_key: [32] 0b  1f 8a ...  49 a3 af
+gpg: DBG: ECC    curve: 1.3.101.111
+gpg: DBG: ECC   pubkey: 5e42bc08be62f4d740196fc1888d18f1d1bd6d21dac63c7265be2897f1c2ce5e \
+gpg: DBG:               9e2140aa3b65620fe0ea2fb443952821ad05967a6d32d849
+gpg: DBG: ecc_mul_point info: Montgomery/SafeCurve
+gpg: DBG: ecc_mul_point name: X448
+gpg: DBG: ecc_mul_point    p:+fffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff \
+gpg: DBG:                     ffffffffffffffffffffffffffffffffffffffffffffffff
+gpg: DBG: ecc_mul_point    a:+98a9
+gpg: DBG: ecc_mul_point    b:+01
+gpg: DBG: ecc_mul_point  g.X:+05
+gpg: DBG: ecc_mul_point  g.Y:+7d235d1295f5b1f66c98ab6e58326fcecbae5d34f55545d060f75dc28df3f6ed \
+gpg: DBG:                     b8027e2346430d211312c4b150677af76fd7223d457b5b1a
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+3fffffffffffffffffffffffffffffffffffffffffffffffffffffff7cca23e9 \
+gpg: DBG:                     c44edb49aed63690216cc2728dc58f552378c292ab5844f3
+gpg: DBG: ecc_mul_point    h:+04
+gpg: DBG: ecc_mul_point info: Montgomery/SafeCurve
+gpg: DBG: ecc_mul_point name: X448
+gpg: DBG: ecc_mul_point    p:+fffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff \
+gpg: DBG:                     ffffffffffffffffffffffffffffffffffffffffffffffff
+gpg: DBG: ecc_mul_point    a:+98a9
+gpg: DBG: ecc_mul_point    b:+01
+gpg: DBG: ecc_mul_point  g.X:+05
+gpg: DBG: ecc_mul_point  g.Y:+7d235d1295f5b1f66c98ab6e58326fcecbae5d34f55545d060f75dc28df3f6ed \
+gpg: DBG:                     b8027e2346430d211312c4b150677af76fd7223d457b5b1a
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+3fffffffffffffffffffffffffffffffffffffffffffffffffffffff7cca23e9 \
+gpg: DBG:                     c44edb49aed63690216cc2728dc58f552378c292ab5844f3
+gpg: DBG: ecc_mul_point    h:+04
+gpg: DBG: ECC    ephem: 139f8e6fc8c7eaebb9561ebcbf097bd6ef8a7237f27919d0a6b788e76cbfcc3f \
+gpg: DBG:               02e9d7e95766fd726220803cfc4ac85ecf064feba42ceef9
+gpg: DBG: ECC     ecdh: 4b111d46976002c0d7983d78732614d8a8f629788003a522f1187bbfb5ee47dc \
+gpg: DBG:               7eddde0b4ddd72185aab13184aa613cd8e19cf9061e720f4
+gpg: DBG: ECC   shared: a84f4f39b310f63ca71df01149951a137fc26e88cf4202d52cb699a89d386d8d \
+gpg: DBG:               b749efc85722563fdfa112de96be3a986f6e8b120931234bd70bca367e8fbad3
+gpg: DBG: Kyber pubkey: 76e799415b04c5b048d8671c59439a7134263c18127971232947aa66d66df134 …
+gpg: DBG: Kyber  ephem: 99f84eb5069c67049a50defcad226d7dddd0064a419c1d4cf85ad7a96c8f278d …
+gpg: DBG: Kyber shared: 8ee009e24a24f1bea36fc074ecbc918ee7b0b4c0946cf0e582916d174756cc73
+gpg: DBG: KEK: dc234778ba64b57215e9f44f6d75ecbbddaeace8dc313ca24097aee3f11ef5a2
+gpg: DBG: seskey: 0b1f8a442bff56df9a5fc23d5162993c455b2849ba1c430e1f0c0ce1ba49a3af
+gpg: DBG: enc_seskey: 28011c5a89b95f0494da1f071a7880482f47d3c3abe5fb37e22c4a91f2959ac3 \
+gpg: DBG:             2291e5aa9c6032f738
+gpg: Kyber/AES256.OCB encrypted for: "F729750F28D72E48 pqc-sample-2"
+gpg: DBG: thekey: 0b1f8a442bff56df9a5fc23d5162993c455b2849ba1c430e1f0c0ce1ba49a3af
+gpg: DBG: nonce: b40ae6a534e169cd107a907bc6bbdf
+gpg: DBG: authdata: d4010902100000000000000000
+gpg: DBG: nonce: b40ae6a534e169cd107a907bc6bbde
+gpg: DBG: authdata: d40109021000000000000000010000000000000087
diff --git a/tests/openpgp/samplemsgs/pqc-sample-3.enc.asc b/tests/openpgp/samplemsgs/pqc-sample-3.enc.asc
index 6ceed5f6b..da6954584 100644
--- a/tests/openpgp/samplemsgs/pqc-sample-3.enc.asc
+++ b/tests/openpgp/samplemsgs/pqc-sample-3.enc.asc
@@ -1,32 +1,94 @@
 -----BEGIN PGP MESSAGE-----
 
-hQS7A7Rwfqm/D/KfHQIDBHU3DvDIzFvwqYhmBHaN2qSe8cDi8rsj8Q4aJkioD9W/
-RJwG2ca+WWpOeBt1LBrZRE2+e1303lPxbWioK/osn+0AAARAZv6eblIHDvd1SgKP
-Ta+5aYdnfSSkUVwes2RrE3g9sa1LbkHACvpyYaA1ZsKjnueqw9q0tSr3IiSQ1Pnb
-yHbokFafgSViMJPbWtWv0d+Nr8piFa8bdNVCtTfwntnHqqHfsMhdBwoH8feq028K
-yqC2kDJq/f22puO3ANOp8cwzuVGRaalDToY7U1umNV1xrv70iyOL/ZRxYIgltV0a
-ZlxZ1xLC4vRcfcczRI/N3+A9w/rBinvxw2d5GYYjRlpjw9xFU6YskbuG3XExus+C
-F0WcJ0DMduSpFpCELuqnD2RuDQKd01IHajzkLuRcBrglUC49+IBNJVNtXkHu3TVH
-OllgHFMp2GaD28uil50oQYYj89Ok7JNir17aUChGNmKVaEkheOiDgeLQKJRpRwu+
-fL4LJYdI2sXnxSUv2uO7qUAvdk5xX5L1QCe4keAF//T14iSt9q00MX+wRfsmP6WC
-nhK7DJJwjN40RcyBrSU0IUe4oR+AIzWNVJRbb1QMA6mhKDICMGknOnKAgfjPYbhp
-kw579C6MS4XxwvwyaZaUQy3loKfOwN7ahp+Hdzn9ojpzDH8WHdgl/UZjj8A6+xC0
-626exdhGm0HSbsIW5ZUa5CZfbwlgsmRDlzovymtJl6Qvqp0845m4H969wwOxM3yC
-8NTUn2yNiZA1WBlM9hHvypU6l8M+cmvLd8aP2v54e47039f+dmeZfnF4N+7C59kA
-YrUyiFmYQEZfNLQAJ4cnggLqQIkS39aYjNVDitw3xhQw9J5uaoMN819pSI4w9rp+
-20JqzRszH7dUVsIFsAwB8kc6eIuJun7sd9Z9a16vRzSP39mM4xMnjyTF0EUSG849
-7n7Kwwgi92aA+VgYCIYc4aKyBeElMTLMdCS2Zlwz3/mMEAiDn9xLE3i0anZ4AoYj
-my1A9lmOB0Ms5F6NKc08riz8/ONerbqO6ArSDo1icrARWtzRsozarPdHTE29Aq9C
-kHYQLJ1aCnUs/f3KLbJEjReXNFimR1L9jsxuof82PeJO9LUAsdUTmkfdh0Ya0gjl
-jaYMdWm7bhoOjoFWPrhBfSlF5D7CCpiFyblio0SrE4FkCawDelhQG12HfcXi/UhF
-Y10g/xnvK86ntus1Gmk/M8BLgKQq3EzWgYvlS/+fI8oNPIxZWyZjW71TAkvjxR8L
-ctnh9rvCQtq38d0lQslZUvmgFZOdPK3y3H3KOZP7vldCW4giI8Dv9fgqqLK/crlT
-WQWgtI0KIFtFeKreLupeMOFRW/cxdZ8Hr5cO8nJkQXGkc7H0Fm2b4IJl3g6h+iLe
-qiw+aEFbNE0j80WV2skRoS+YhhaESoP+Q9S6O+o0g6M9hZpGszLGN7RgUScTq9oV
-N0zMUJ1phrVR9q0DwIaxm9bnuswO/qpmkIOcO/w/eIx49HAwlzSf8em34laGJNBC
-hofsGUNKy/8tNikiJClvZU9s4kwJKOHU/UlwTZyyqHewonFrqnuNxTWPcKe+3gP1
-sxTzLo9nqC1SsWIwn53UeAEJAhDorI7/L0xtmEijEyFL73ztomomHYQkCfh1i9+z
-9z0pzPXAFv8mWqKhj/jWOlQoGSO+o3yOcsfCcHG0fRwrCi88Gqe1r5AcWEjlm3Ru
-BfsI2CQsGk6vslxsAAUx5HMajVohSl+fb4ptpPoQi4UlafSJPCxJig==
-=Cv77
+hQS7A+EuI54NbrFWCAIDBJiOh81yNWKXdp2mI0OXFIHIU8mRP3E+1OQVOevyVziJ
+QRTHDq9G4VbYBgIF812TQTp5jF+7D51WWl7wACLq1lsAAARAyOgxDOwOzAPHcjui
+SAATOdPnWjNjiOy7Sy8TIXtL7AKwt1uV4WRaNfCn7OWioi5xgv8R7UzRKRZK21Q9
+xWG4HByHpmFq8mhqm4UEY8x6Ev71YRKPHChARCJv7Fuks+R8nWLiqfX2J1PQ5O05
+Ctc5LjigpqzMQ5YqPL6esg/5eANevpyzuOANbgqB/cTaFldwZBP+MbKNxdoiyyUk
+eI9bgKmq3vWuPpfdPXlK66HZrx8yFkJ3F5pLTS3zo+mgte1u8y1zf0FWqLol9YOm
+8UQfDYB78QsAqru82laQ3f7j8NMFd5f+Y/sXDFGKl/NkjjOdLwJu7xc1UOegiazK
+YZj7mhpM2niSIW56LlhiVZnTsn99iW1Ltcbsn9YNUEO1R7EMw9E//uB565/4LyVV
+UrzdmThDLYDVB73AxxerPXb273x/qapHEkWYtZ5qz/59BqgJcCpQzF9QMPCKoqH2
+LXK/5WSPy8Dbqsiw7cLdOVXVPVJE8p8NTfPvZYLqB2xfClQrTihjpkWEwAWPlJkA
+alcgVilUP8XdF+vZIs7KekcUTFHd8jf6VaI2T2CqzBFNDUBNnWiQ4ie+Wdvktlad
+xV5oTN/J1ZCauyyySmpZGkVT+y17yKMWKp5Io+hAXau6MiykzYcJOGDYhnv2elmv
+2AQuwu+Ami5AZfaU86rJfb24mAf8zqmAo7ICU8KrbziABhNJACCI1WzFYgjKvihJ
+tFmRoBmVFCZ7652lMWPDd87pM2i/Vg4nSqR9pQUh56o69O1JwjXWY8hH8SbBXNPy
+rQORmA35FcVg18cLfon8gZNcLw0BWBKdq4+wLNCHIr7FuZKU8vxezzmGrbd9On6W
+IRX85XXEfPhlE3mfaSbV5cgQ8Ty5FbA8inZzUKgGlDfuGY5XOT43msHh1bGCCfc9
+pF+q5jOOSU9A0eZcjC3OkxtrVD61xSuoeSH6ZauDXwlo7kBrIiyBrT4C4Xg/JVth
+SuhrXGUyYfUSuJfSjIWRv569B/NnJ5qjeUdq/nejV+QVN67rA+4zhbbJvFqGHU1D
+1RQQb4tL+6+iQF1id4SdOQZQHInT8FGVwgBepMxx48Hoe1lVaK/8pchQGZvzk6vn
+ePx2q1pNvbH+hrJrwTw7xLlXHzwIFQt7tlMs1Q8jBdcHo8KE4GF3O0fEpAs6NgvO
+IO7XMsE4FlQhb6o8XEMf3SGpwrbXmrxFNa143bmOb4dtx9D3m5FU0Dj+q9p2TgGB
+94WFmLrruQ426t9thSMlHfo3PzYbiL0u9/LwSsUZwGw1tQTillW9QhSEUeG9mY6F
+OkCF47JZydAbn55Tn9gCft0E107X8Eas1ZLTeWQ0G90ANuoY5PO8RMf+yMwsICf1
+Ts04/xmsMU2S2+KYnDlOQyw4cYbpTN0tcNyVu09z/b82jMnOFQUNexBEpc5iyhGI
+hHw/B7jIFX64UItTjefh5qJTHz4JKKGZw6ZgjpiIjgTH0EfW1rb1gN4hHx8L2MjF
+CHEuDG7L9Sd81K7mFM3UkgEJAhAdyditLTspHm1yp87415fUSP3vqDjZvxZE3hDf
+7onnXQkHpd2DA6nsdm8ErwqJxAuQrVf3KEJCYZpqsRN6ju6Uj8KeYStDIxZHMv0b
+/Qs5AKZlJlOKMTq0wRij2/oKqdE+m22BkDT/koUchWHGNfICJOfA+IhQ5eviMLET
+Dx7ow2A5mI8ZZdEmqga7G/KE
+=RwAj
 -----END PGP MESSAGE-----
+
+Created with key:
+
+sec   brainpoolP256r1 2024-04-23 [SC]
+      9F7DCCABC11EFE248F48CECD6F6570B33D05BDF8
+      Keygrip = A87B85D88DB8B2B5A62A9958C8F2878F49605D09
+uid           [ultimate] pqc-sample-3
+ssb   ky768_bp256 2024-09-11 [E]
+      E12E239E0D6EB1566CDC60A13FD23FFBF4A8FBEB4C91BAB47058C6EF63F3738B
+      Keygrip = D54E9B75C3541D95C45E430DAC9645E9FB62C668,
+                EAD718DCE3D2F33A20BFC8BA617844DEF3FFAF3A
+
+Encryption with --debug=crypto diagnostics:
+
+gpg: DBG: DEK is:  c25ed07da6dfdcb342ec34a372d41f370b4146fa5b953859d035c0b9195a6415
+gpg: DBG: encode_session_key: encoding 32 byte DEK
+gpg: DBG: encode_session_key: [32] c2  5e d0 ...  5a 64 15
+gpg: DBG: ECC    curve: 1.3.36.3.3.2.8.1.1.7
+gpg: DBG: ECC   pubkey: 049a80f4c7499ae14056f51d49d9899d7b73db1be7ee62eeeaa477c7a1f96f55 \
+gpg: DBG:               f118cc0c0f89ff23e636c4f27ac51f6c571802606689a9fd9940d717eedb0702 \
+gpg: DBG:               ed
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP256r1
+gpg: DBG: ecc_mul_point    p:+a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377
+gpg: DBG: ecc_mul_point    a:+7d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9
+gpg: DBG: ecc_mul_point    b:+26dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b6
+gpg: DBG: ecc_mul_point  g.X:+8bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262
+gpg: DBG: ecc_mul_point  g.Y:+547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f046997
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP256r1
+gpg: DBG: ecc_mul_point    p:+a9fb57dba1eea9bc3e660a909d838d726e3bf623d52620282013481d1f6e5377
+gpg: DBG: ecc_mul_point    a:+7d5a0975fc2c3057eef67530417affe7fb8055c126dc5c6ce94a4b44f330b5d9
+gpg: DBG: ecc_mul_point    b:+26dc5c6ce94a4b44f330b5d9bbd77cbf958416295cf7e1ce6bccdc18ff8c07b6
+gpg: DBG: ecc_mul_point  g.X:+8bd2aeb9cb7e57cb2c4b482ffc81b7afb9de27e1e3bd23c23a4453bd9ace3262
+gpg: DBG: ecc_mul_point  g.Y:+547ef835c3dac4fd97f8461a14611dc9c27745132ded8e545c1d54c72f046997
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+a9fb57dba1eea9bc3e660a909d838d718c397aa3b561a6f7901e0e82974856a7
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ECC    ephem: 04988e87cd72356297769da62343971481c853c9913f713ed4e41539ebf25738 \
+gpg: DBG:               894114c70eaf46e156d8060205f35d93413a798c5fbb0f9d565a5ef00022ead6 \
+gpg: DBG:               5b
+gpg: DBG: ECC     ecdh: 04a5146da410f68c58d0539fae846f072cd1647b442be9155e4e5707707da125 \
+gpg: DBG:               4c0d35225540762e803d1afe222d8e639adf9399628a18d7f7149bedeb6adbb7 \
+gpg: DBG:               4a
+gpg: DBG: ECC   shared: dff5a0ff0de4908bb02f742ccf29f3099846ad6f9725a550a23e88ee02ca9f2c
+gpg: DBG: Kyber pubkey: 46a3ce8b663a26cb4afc5a5ed35a405ad3b3a66b47a859a458ac6f1bf3518575 …
+gpg: DBG: Kyber  ephem: c8e8310cec0ecc03c7723ba248001339d3e75a336388ecbb4b2f13217b4bec02 …
+gpg: DBG: Kyber shared: a10649e16a78e7eb0306490baaee3bb9208ad2ee43bf48b50b9a0c58d598a810
+gpg: DBG: KEK: 20cbd000c056db05688ce386a8a4bc7befd62b9fb660bfabd48679cdd15894cb
+gpg: DBG: seskey: c25ed07da6dfdcb342ec34a372d41f370b4146fa5b953859d035c0b9195a6415
+gpg: DBG: enc_seskey: 28a199c3a6608e98888e04c7d047d6d6b6f580de211f1f0bd8c8c508712e0c6e \
+gpg: DBG:             cbf5277cd4aee614cd
+gpg: Kyber/AES256.OCB encrypted for: "E12E239E0D6EB156 pqc-sample-3"
+gpg: DBG: thekey: c25ed07da6dfdcb342ec34a372d41f370b4146fa5b953859d035c0b9195a6415
+gpg: DBG: nonce: 1dc9d8ad2d3b291e6d72a7cef8d797
+gpg: DBG: authdata: d4010902100000000000000000
+gpg: DBG: nonce: 1dc9d8ad2d3b291e6d72a7cef8d796
+gpg: DBG: authdata: d4010902100000000000000001000000000000005f
diff --git a/tests/openpgp/samplemsgs/pqc-sample-4.enc.asc b/tests/openpgp/samplemsgs/pqc-sample-4.enc.asc
index f083a1248..8f66f4ced 100644
--- a/tests/openpgp/samplemsgs/pqc-sample-4.enc.asc
+++ b/tests/openpgp/samplemsgs/pqc-sample-4.enc.asc
@@ -1,43 +1,120 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-se4uGUbzOJfEhVQ7
-=rlF7
+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
+=aWWp
 -----END PGP MESSAGE-----
+
+Created with key:
+
+sec   brainpoolP384r1 2024-04-23 [SC]
+      A8237D19988A8255E70D2566EC280D0923FB2DF7
+      Keygrip = 702F599E35E6E0BE68E6FDF25D887229D42780F7
+uid           [ultimate] pqc-sample-4
+ssb   ky1024_bp384 2024-09-11 [E]
+      D08906570547EE758055DB40DCD9A1AAEBDA41BE4F6EFC3DF429D627C1AF6D9F
+      Keygrip = 19C87B74004E9839F3D56992B0A9943BF90B56F7,
+                7C31A4A632A49C4E8B1C8CBA53976ADFF714510F
+
+Encryption with --debug=crypto diagnostics:
+
+gpg: DBG: DEK is:  16f663a126e1f4bdb7f8fcec843a1013eab9b82cf08f05e10c31fd4267c998d9
+gpg: DBG: encode_session_key: encoding 32 byte DEK
+gpg: DBG: encode_session_key: [32] 16  f6 63 ...  c9 98 d9
+gpg: DBG: ECC    curve: 1.3.36.3.3.2.8.1.1.11
+gpg: DBG: ECC   pubkey: 0472fb0d5a0a01e55c29e9fb8c5c425bdf37150dafa3c556c786e2fef9e01191 \
+gpg: DBG:               9e683dbc7731d1281fdb9780c4b7fd7785198516be2033d06448ba7ea39c2bcb \
+gpg: DBG:               7128bc1e0b3f81f2e734434e6fe96b29e19c57b423c5009134010cd87fadca63 \
+gpg: DBG:               a1
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP384r1
+gpg: DBG: ecc_mul_point    p:+8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b412b1da197fb71123 \
+gpg: DBG:                     acd3a729901d1a71874700133107ec53
+gpg: DBG: ecc_mul_point    a:+7bc382c63d8c150c3c72080ace05afa0c2bea28e4fb22787139165efba91f90f \
+gpg: DBG:                     8aa5814a503ad4eb04a8c7dd22ce2826
+gpg: DBG: ecc_mul_point    b:+04a8c7dd22ce28268b39b55416f0447c2fb77de107dcd2a62e880ea53eeb62d5 \
+gpg: DBG:                     7cb4390295dbc9943ab78696fa504c11
+gpg: DBG: ecc_mul_point  g.X:+1d1c64f068cf45ffa2a63a81b7c13f6b8847a3e77ef14fe3db7fcafe0cbd10e8 \
+gpg: DBG:                     e826e03436d646aaef87b2e247d4af1e
+gpg: DBG: ecc_mul_point  g.Y:+8abe1d7520f9c2a45cb1eb8e95cfd55262b70b29feec5864e19c054ff9912928 \
+gpg: DBG:                     0e4646217791811142820341263c5315
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7 \
+gpg: DBG:                     cf3ab6af6b7fc3103b883202e9046565
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP384r1
+gpg: DBG: ecc_mul_point    p:+8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b412b1da197fb71123 \
+gpg: DBG:                     acd3a729901d1a71874700133107ec53
+gpg: DBG: ecc_mul_point    a:+7bc382c63d8c150c3c72080ace05afa0c2bea28e4fb22787139165efba91f90f \
+gpg: DBG:                     8aa5814a503ad4eb04a8c7dd22ce2826
+gpg: DBG: ecc_mul_point    b:+04a8c7dd22ce28268b39b55416f0447c2fb77de107dcd2a62e880ea53eeb62d5 \
+gpg: DBG:                     7cb4390295dbc9943ab78696fa504c11
+gpg: DBG: ecc_mul_point  g.X:+1d1c64f068cf45ffa2a63a81b7c13f6b8847a3e77ef14fe3db7fcafe0cbd10e8 \
+gpg: DBG:                     e826e03436d646aaef87b2e247d4af1e
+gpg: DBG: ecc_mul_point  g.Y:+8abe1d7520f9c2a45cb1eb8e95cfd55262b70b29feec5864e19c054ff9912928 \
+gpg: DBG:                     0e4646217791811142820341263c5315
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+8cb91e82a3386d280f5d6f7e50e641df152f7109ed5456b31f166e6cac0425a7 \
+gpg: DBG:                     cf3ab6af6b7fc3103b883202e9046565
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ECC    ephem: 0400995e459b5273ea861a3fb3b13d76a9362ee09bf90385333ece346a9a82ea \
+gpg: DBG:               79f2faa7441df8a95217320c3a4a60a093001df55266debbe094139be1cee345 \
+gpg: DBG:               1fc403335372669a1edc962174e81ee22cd2cf2e0d0b7b41b4a40dfb3f37a4c6 \
+gpg: DBG:               c4
+gpg: DBG: ECC     ecdh: 0410222ed99593852b795a96e26fa44c63c348b8f0273ae471b024a7cc788edb \
+gpg: DBG:               1307b19b89afc8b7efc87bda6d30be7a87393fa48756f6c3288c2997652126ce \
+gpg: DBG:               b2675ae46db15339cfdd38e3d294f689d64c6894f52afd3ea6b65bfb660be143 \
+gpg: DBG:               76
+gpg: DBG: ECC   shared: 61ff9e92362ad211a4c9f5c735d8c364e99ebea28491a81497ded16e21c94d66 \
+gpg: DBG:               3a3af7ea725a71dfd93ee18e562edbeb135ffdb41f5f198799f3ab8c390fe4e7
+gpg: DBG: Kyber pubkey: 9a9a0790782c7f4a7f51934777fbcf7e56c66c2a56158680e424196d2749b7d6 …
+gpg: DBG: Kyber  ephem: 2e4ad41e98a2159ee6e5fdbcab030ade20cfc6c42d16e8fdfda0abcf2bd66f29 …
+gpg: DBG: Kyber shared: 73f7d4d223aa26479dd401c614952f3f12405e739f4b5391d0e6e9d8e29bae99
+gpg: DBG: KEK: b14c20e4e048f36aa4e128452053effd7e6c344cd98160c7ac4428c4a85da05e
+gpg: DBG: seskey: 16f663a126e1f4bdb7f8fcec843a1013eab9b82cf08f05e10c31fd4267c998d9
+gpg: DBG: enc_seskey: 28c81b1f892abc0fd59588e113b8bd851fd39869124c8a2562e7101196d6f95e \
+gpg: DBG:             c50534a35d475051ed
+gpg: Kyber/AES256.OCB encrypted for: "D08906570547EE75 pqc-sample-4"
+gpg: DBG: thekey: 16f663a126e1f4bdb7f8fcec843a1013eab9b82cf08f05e10c31fd4267c998d9
+gpg: DBG: nonce: add583dc072765cb6b3aefa6f1dcd7
+gpg: DBG: authdata: d4010902100000000000000000
+gpg: DBG: nonce: add583dc072765cb6b3aefa6f1dcd6
+gpg: DBG: authdata: d40109021000000000000000010000000000000053
diff --git a/tests/openpgp/samplemsgs/pqc-sample-5.enc.asc b/tests/openpgp/samplemsgs/pqc-sample-5.enc.asc
index eb20f9791..031e1d814 100644
--- a/tests/openpgp/samplemsgs/pqc-sample-5.enc.asc
+++ b/tests/openpgp/samplemsgs/pqc-sample-5.enc.asc
@@ -1,45 +1,125 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-MQHiPA1Y6KsYPhsQYg==
-=aAoH
+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
+abDenKjFa7E71n1mxchjXLC/o1PJzio=
+=7tuh
 -----END PGP MESSAGE-----
+
+Created with key:
+
+sec   brainpoolP512r1 2024-04-23 [SC]
+      7B3986A550E5DB116054B4B42CBE157D37FDEC1D
+      Keygrip = A1ABFD89944870D04039D40C218EE127254AEEE9
+uid           [ unknown] pqc-sample-5
+ssb   ky1024_bp512 2024-09-11 [E]
+      422FF6EF556A97E3F26A090A7AF17214E88B670970D9E512A51515F2C948C649
+      Keygrip = 513906BEA5A40F25C9D6EBBCEF62D0784E7235A5,
+                6EC551A7895031EE4543A1C789E16E6A6C229CFC
+
+Encryption with --debug=crypto diagnostics:
+
+gpg: DBG: DEK is:  3145f9ffe79da15a7db2efff1328687ce88cc2c1f96e88660253a46c8ab7b417
+gpg: DBG: encode_session_key: encoding 32 byte DEK
+gpg: DBG: encode_session_key: [32] 31  45 f9 ...  b7 b4 17
+gpg: DBG: ECC    curve: 1.3.36.3.3.2.8.1.1.13
+gpg: DBG: ECC   pubkey: 046e26896eac8d3d7f31f0b57439ffdbc0078841cef7a9a98ab15f489fee34e9 \
+gpg: DBG:               d15e2050eafca0cd4c7021e5e018f601eec7edde1aace959ea13f84143861489 \
+gpg: DBG:               dd54adaa4ff86e5ff75e3cc2ea6453716075dd908b9647b45257a64ae88dd390 \
+gpg: DBG:               d7325b9e3069802716b3743afe7a7e44495af625c3e009c581c63e341a16a23d \
+gpg: DBG:               07
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP512r1
+gpg: DBG: ecc_mul_point    p:+aadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330871 \
+gpg: DBG:                     7d4d9b009bc66842aecda12ae6a380e62881ff2f2d82c68528aa6056583a48f3
+gpg: DBG: ecc_mul_point    a:+7830a3318b603b89e2327145ac234cc594cbdd8d3df91610a83441caea9863bc \
+gpg: DBG:                     2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a72bf2c7b9e7c1ac4d77fc94ca
+gpg: DBG: ecc_mul_point    b:+3df91610a83441caea9863bc2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a7 \
+gpg: DBG:                     2bf2c7b9e7c1ac4d77fc94cadc083e67984050b75ebae5dd2809bd638016f723
+gpg: DBG: ecc_mul_point  g.X:+81aee4bdd82ed9645a21322e9c4c6a9385ed9f70b5d916c1b43b62eef4d0098e \
+gpg: DBG:                     ff3b1f78e2d0d48d50d1687b93b97d5f7c6d5047406a5e688b352209bcb9f822
+gpg: DBG: ecc_mul_point  g.Y:+7dde385d566332ecc0eabfa9cf7822fdf209f70024a57b1aa000c55b881f8111 \
+gpg: DBG:                     b2dcde494a5f485e5bca4bd88a2763aed1ca2b2fa8f0540678cd1e0f3ad80892
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+aadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870 \
+gpg: DBG:                     553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ecc_mul_point info: Weierstrass/Standard
+gpg: DBG: ecc_mul_point name: brainpoolP512r1
+gpg: DBG: ecc_mul_point    p:+aadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330871 \
+gpg: DBG:                     7d4d9b009bc66842aecda12ae6a380e62881ff2f2d82c68528aa6056583a48f3
+gpg: DBG: ecc_mul_point    a:+7830a3318b603b89e2327145ac234cc594cbdd8d3df91610a83441caea9863bc \
+gpg: DBG:                     2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a72bf2c7b9e7c1ac4d77fc94ca
+gpg: DBG: ecc_mul_point    b:+3df91610a83441caea9863bc2ded5d5aa8253aa10a2ef1c98b9ac8b57f1117a7 \
+gpg: DBG:                     2bf2c7b9e7c1ac4d77fc94cadc083e67984050b75ebae5dd2809bd638016f723
+gpg: DBG: ecc_mul_point  g.X:+81aee4bdd82ed9645a21322e9c4c6a9385ed9f70b5d916c1b43b62eef4d0098e \
+gpg: DBG:                     ff3b1f78e2d0d48d50d1687b93b97d5f7c6d5047406a5e688b352209bcb9f822
+gpg: DBG: ecc_mul_point  g.Y:+7dde385d566332ecc0eabfa9cf7822fdf209f70024a57b1aa000c55b881f8111 \
+gpg: DBG:                     b2dcde494a5f485e5bca4bd88a2763aed1ca2b2fa8f0540678cd1e0f3ad80892
+gpg: DBG: ecc_mul_point  g.Z:+01
+gpg: DBG: ecc_mul_point    n:+aadd9db8dbe9c48b3fd4e6ae33c9fc07cb308db3b3c9d20ed6639cca70330870 \
+gpg: DBG:                     553e5c414ca92619418661197fac10471db1d381085ddaddb58796829ca90069
+gpg: DBG: ecc_mul_point    h:+01
+gpg: DBG: ECC    ephem: 04595ef7b255dbc3733ceafeb430a705c5c6ac61d22d202377d1fe1322107737 \
+gpg: DBG:               9b44556ce7a1dbd269280daa5801bfa0c6b7762f9223fe860e53762e628ff210 \
+gpg: DBG:               be3f7ad98afc9ab95336298e553481c393ec6f7b73ef1ef376cbb3a81336cf72 \
+gpg: DBG:               bfa65d0e1e9c379b100decae493753591f15ea028f6cc735336c55d1d58c4f34 \
+gpg: DBG:               7f
+gpg: DBG: ECC     ecdh: 044ccb3fc7cdc6587cd183cc6106d132b7093f47ca35faa04fa42e8b4d0be89b \
+gpg: DBG:               b051c22ade80104bcd26f9660858eb101f27fc8f49fcbad3d6644f7cd9fe85c4 \
+gpg: DBG:               da579977bacac4dcf8376fd388b37bf6a4e5bd38cfe8ad6d473770e141518873 \
+gpg: DBG:               b9a0d9c6b4015f76627ec41362ce6962b46d3eb9305c5ce6d646a8d1cf1d1507 \
+gpg: DBG:               95
+gpg: DBG: ECC   shared: 7d0f8a01267b9506d84f4221c4ef953454db70adba4df244b6e72ca90e07672f \
+gpg: DBG:               44c77b5df14ae250eedfda3cf7c1fd000a81a186a351ab0539b1f716d4bb02bf
+gpg: DBG: Kyber pubkey: be7768b33800b583978414965ec439d29a4180655b0a58ba40cb9c29d10088a0 …
+gpg: DBG: Kyber  ephem: 9f3069320af41fe4cc7abdfcad5a25d5e85a1cd13bc788aae80e5d3d2e1fe5fb …
+gpg: DBG: Kyber shared: 109de2e53c3e86117943611200eb2feddb0a8a41e96bb2f9bd4f66a51620517c
+gpg: DBG: KEK: 8f95781921048f78e51ac431e6f4f0a20635528c434e612439997b788b44b040
+gpg: DBG: seskey: 3145f9ffe79da15a7db2efff1328687ce88cc2c1f96e88660253a46c8ab7b417
+gpg: DBG: enc_seskey: 28d4072f5f315cfb6f85e3df1896a728339cc360fecc938af04f0138e40ec66d \
+gpg: DBG:             1e4dbd43943b2a65d4
+gpg: Kyber/AES256.OCB encrypted for: "422FF6EF556A97E3 pqc-sample-5"
+gpg: DBG: thekey: 3145f9ffe79da15a7db2efff1328687ce88cc2c1f96e88660253a46c8ab7b417
+gpg: DBG: nonce: 56225b032e739dcfdb220e2deff64c
+gpg: DBG: authdata: d4010902100000000000000000
+gpg: DBG: nonce: 56225b032e739dcfdb220e2deff64d
+gpg: DBG: authdata: d40109021000000000000000010000000000000084