gnupg 2.5.22 -> 2.5.24 update breaks notmuch configure

[Werner Koch]

Hi!

> Indeed there is a severe bug in the import code.  I created ticket T8469

The bug has been fixed.  We may do another release in a few says.

3014498 * tests: Add a test for T8469
5523cec * gpg: Use the canoncial name in imported unprotected private keys.
42386bc * gpg: Fix import of unprotected ECDH keys

The actual fix is 42386bc.  The code for transferring unprotected keys
was changed to better cope with the requirements of RFC-9980 and
obviously we had no test case to import an ECDH key but we either
created a test key as part of the test suite or imported the actual
private key files directly as <keygrip>.key files.

5523cec has no functional change but makes the key files again easier to
comprehend (regression due to the original change).

--8<---------------cut here---------------start------------->8---
diff --git a/g10/import.c b/g10/import.c
index 593995c37..793c0479d 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -2732,11 +2732,11 @@ build_mode1003_sexp (PKT_public_key *pk, gcry_sexp_t *result)
       else if (openpgp_oid_is_cv25519 (pk->pkey[0]))
         err = gcry_sexp_build
           (&skey,NULL,"(private-key(ecc(curve %s)(flags djb-tweak)(q%m)(d%m)))",
-           curvename, pk->pkey[2], pk->pkey[3]);
+           curvename, pk->pkey[1], pk->pkey[3]);
       else
         err = gcry_sexp_build
           (&skey,NULL,"(private-key(ecc(curve %s)(q%m)(d%m)))",
-           curvename, pk->pkey[2], pk->pkey[3]);
+           curvename, pk->pkey[1], pk->pkey[3]);
       break;
 
     case PUBKEY_ALGO_X25519:
--8<---------------cut here---------------end--------------->8---



Salam-Shalom,

   Werner

-- 
The pioneers of a warless world are the youth that
refuse military service.             - A. Einstein
-------------- next part --------------
A non-text attachment was scrubbed...
Name: openpgp-digital-signature.asc
Type: application/pgp-signature
Size: 284 bytes
Desc: not available
URL: <https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20260928/a3666a26/attachment.sig>