summaryrefslogtreecommitdiff
path: root/src/gcrypt.h.in
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2013-10-08 16:18:09 +0200
committerWerner Koch <wk@gnupg.org>2013-10-08 16:18:09 +0200
commitf79d3e13d3229115c47cbe5007647cb44105fe3f (patch)
treea7765a1f1ba37af1431e8a0bad95eed1eef8dcc7 /src/gcrypt.h.in
parent2c1334222ffb00c32cc2d1ae1adec27cdebfa04d (diff)
downloadlibgcrypt-f79d3e13d3229115c47cbe5007647cb44105fe3f.tar.gz
cipher: Deprecate GCRY_PK_ELG_E.
* cipher/elgamal.c (_gcry_pubkey_spec_elg_e): Remove. * cipher/pubkey.c (pubkey_list): Remove double included _gcry_pubkey_spec_elg. (map_algo): MAke ELG_E to ELG. -- It does not make sense to have different algorithm identifiers for Elgamal encryption and the obsolete Elgamal signing. Thus mark one of them as deprecated and remove the useless extra spec info in elgamal.c. Frankly it is questionable why at all we need the algorithm identifiers; they are a remain from the time when Libgcrypt was part of GnuPG. With the s-expression based API the IDs they don't make much sense. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/gcrypt.h.in')
-rw-r--r--src/gcrypt.h.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 719b9516..8646f43d 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -974,16 +974,16 @@ size_t gcry_cipher_get_algo_blklen (int algo);
* *
************************************/
-/* The algorithms and their IDs we support. */
+/* The algorithms and their IDs we support. */
enum gcry_pk_algos
{
- GCRY_PK_RSA = 1,
- GCRY_PK_RSA_E = 2, /* (deprecated) */
- GCRY_PK_RSA_S = 3, /* (deprecated) */
- GCRY_PK_ELG_E = 16,
- GCRY_PK_DSA = 17,
+ GCRY_PK_RSA = 1, /* RSA */
+ GCRY_PK_RSA_E = 2, /* (deprecated: use 1). */
+ GCRY_PK_RSA_S = 3, /* (deprecated: use 1). */
+ GCRY_PK_ELG_E = 16, /* (deprecated: use 20). */
+ GCRY_PK_DSA = 17, /* Digital Signature Algorithm. */
GCRY_PK_ECC = 18, /* Generic ECC. */
- GCRY_PK_ELG = 20,
+ GCRY_PK_ELG = 20, /* Elgamal */
GCRY_PK_ECDSA = 301, /* (deprecated: use 18). */
GCRY_PK_ECDH = 302 /* (deprecated: use 18). */
};