summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorIngo Klöcker <dev@ingo-kloecker.de>2022-08-17 14:19:46 +0200
committerIngo Klöcker <dev@ingo-kloecker.de>2022-09-09 18:23:11 +0200
commit07b0786939c8316130314dfadc4933077ff6e36d (patch)
tree73d5b73b9d1c2bb511bcc82dc26921f28947f14f /common
parentagent: Don't start in --supervised mode if no-autostart is enabled. (diff)
downloadgnupg2-07b0786939c8316130314dfadc4933077ff6e36d.tar.xz
gnupg2-07b0786939c8316130314dfadc4933077ff6e36d.zip
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
Diffstat (limited to 'common')
-rw-r--r--common/openpgp-oid.c1
1 files changed, 0 insertions, 1 deletions
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;
}
}