1 files changed, 75 insertions, 69 deletions
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