1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-11 23:59:50 +02:00

Revert "common: Add a default OpenPGP ECC mapping."

This reverts commit 8e63e813c7.

The change broke adding existing ECDH encryption subkeys to a key.

GnuPG-bug-id: 5555
This commit is contained in:
Ingo Klöcker 2022-08-17 14:19:46 +02:00
parent abf7d3c545
commit 07b0786939
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9

View File

@ -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_EDDSA: return PUBKEY_ALGO_EDDSA;
case GCRY_PK_ECDSA: return PUBKEY_ALGO_ECDSA; case GCRY_PK_ECDSA: return PUBKEY_ALGO_ECDSA;
case GCRY_PK_ECDH: return PUBKEY_ALGO_ECDH; 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; default: return algo < 110 ? (pubkey_algo_t)algo : 0;
} }
} }