From 07b0786939c8316130314dfadc4933077ff6e36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 17 Aug 2022 14:19:46 +0200 Subject: [PATCH] Revert "common: Add a default OpenPGP ECC mapping." This reverts commit 8e63e813c7404e1dae1def98e0f45d148f71082d. The change broke adding existing ECDH encryption subkeys to a key. GnuPG-bug-id: 5555 --- common/openpgp-oid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 8b16335b0..f0460b068 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -581,7 +581,6 @@ map_gcry_pk_to_openpgp (enum gcry_pk_algos algo) case GCRY_PK_EDDSA: return PUBKEY_ALGO_EDDSA; case GCRY_PK_ECDSA: return PUBKEY_ALGO_ECDSA; case GCRY_PK_ECDH: return PUBKEY_ALGO_ECDH; - case GCRY_PK_ECC: return PUBKEY_ALGO_ECDSA; /* Most useful mapping. */ default: return algo < 110 ? (pubkey_algo_t)algo : 0; } }