From 89103ce00e862cc709e80fa41f2ee13d54093ec5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 7 Sep 2013 10:06:46 +0200 Subject: pk: Merge extraspecs struct with standard specs struct. * src/gcrypt-module.h (gcry_pk_spec_t): Move this typedef and the corresponding function typedefs to ... * src/cipher-proto.h: here. (pk_extra_spec_t): Remove typedef and merge fields into gcry_pk_spec_t. * cipher/rsa.c, cipher/dsa.c, cipher/elg.c, cipher/ecc.c: Ditto. * cipher/pubkey.c: Change accordingly. * src/cipher.h (_gcry_pubkey_extraspec_rsa): Remove. (_gcry_pubkey_extraspec_dsa): Remove. (_gcry_pubkey_extraspec_elg): Remove. (_gcry_pubkey_extraspec_ecdsa): Remove. -- Now that we don't have loadable modules anymore, we don't need to keep the internal API between the modules and thus can simplify the code. Signed-off-by: Werner Koch --- cipher/elgamal.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cipher/elgamal.c') diff --git a/cipher/elgamal.c b/cipher/elgamal.c index d105cb46..44990aae 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -849,12 +849,7 @@ gcry_pk_spec_t _gcry_pubkey_spec_elg = elg_decrypt, elg_sign, elg_verify, - elg_get_nbits - }; - -pk_extra_spec_t _gcry_pubkey_extraspec_elg = - { + elg_get_nbits, NULL, - elg_generate_ext, - NULL + elg_generate_ext }; -- cgit v1.2.1