summaryrefslogtreecommitdiff
path: root/src/cipher.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2013-11-05 19:00:09 +0100
committerWerner Koch <wk@gnupg.org>2013-11-05 19:00:09 +0100
commitb9fd3988b54b50109f4e7179e7fe0739bb1d97c5 (patch)
tree879510f3cfce1a862506cb34edbacdb05d7ca6bd /src/cipher.h
parentf09ffe8a4802af65a116e79eceeb1cb4ed4fa2f4 (diff)
downloadlibgcrypt-b9fd3988b54b50109f4e7179e7fe0739bb1d97c5.tar.gz
ecc: Require "eddsa" flag for curve Ed25519.
* src/cipher.h (PUBKEY_FLAG_ECDSA): Remove. * cipher/pubkey-util.c (_gcry_pk_util_parse_flaglist): Remove "ecdsa". * cipher/ecc.c (ecc_generate, ecc_sign, ecc_verify): Require "eddsa" flag. * cipher/ecc-misc.c (_gcry_ecc_compute_public): Depend "eddsa" flag. * tests/benchmark.c, tests/keygen.c, tests/pubkey.c * tests/t-ed25519.c, tests/t-mpi-point.c: Adjust for changed flags. -- This changes make using ECDSA signatures the default for all curves. If another signing algorithm is to be used, the corresponding flag needs to be given. In particular the flags "eddsa" is now always required with curve Ed25519 to comply with the specs. This change makes the code better readable by not assuming a certain signature algorithm depending on the curve. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/cipher.h')
-rw-r--r--src/cipher.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cipher.h b/src/cipher.h
index 551dc66a..5ac891e0 100644
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -35,11 +35,10 @@
#define PUBKEY_FLAG_USE_X931 (1 << 6)
#define PUBKEY_FLAG_USE_FIPS186 (1 << 7)
#define PUBKEY_FLAG_USE_FIPS186_2 (1 << 8)
-#define PUBKEY_FLAG_ECDSA (1 << 9)
-#define PUBKEY_FLAG_EDDSA (1 << 10)
-#define PUBKEY_FLAG_GOST (1 << 11)
-#define PUBKEY_FLAG_NOPARAM (1 << 12)
-#define PUBKEY_FLAG_COMP (1 << 12)
+#define PUBKEY_FLAG_NOPARAM (1 << 9)
+#define PUBKEY_FLAG_COMP (1 << 10)
+#define PUBKEY_FLAG_EDDSA (1 << 11)
+#define PUBKEY_FLAG_GOST (1 << 12)
enum pk_operation