diff options
| author | Werner Koch <wk@gnupg.org> | 2013-09-07 10:06:46 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-09-18 21:03:40 +0200 |
| commit | 89103ce00e862cc709e80fa41f2ee13d54093ec5 (patch) | |
| tree | ecdc150128108512ff20a45159a4d5c740daa2a9 /cipher/ecc.c | |
| parent | 2ad7ea9cb388fd31e4b0852b68d77f599ef4adce (diff) | |
| download | libgcrypt-89103ce00e862cc709e80fa41f2ee13d54093ec5.tar.gz | |
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 <wk@gnupg.org>
Diffstat (limited to 'cipher/ecc.c')
| -rw-r--r-- | cipher/ecc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cipher/ecc.c b/cipher/ecc.c index 9766e9e2..5340d57e 100644 --- a/cipher/ecc.c +++ b/cipher/ecc.c @@ -2012,7 +2012,13 @@ gcry_pk_spec_t _gcry_pubkey_spec_ecdsa = NULL, ecc_sign, ecc_verify, - ecc_get_nbits + ecc_get_nbits, + run_selftests, + ecc_generate_ext, + compute_keygrip, + _gcry_ecc_get_param, + _gcry_ecc_get_curve, + _gcry_ecc_get_param_sexp }; gcry_pk_spec_t _gcry_pubkey_spec_ecdh = @@ -2026,12 +2032,7 @@ gcry_pk_spec_t _gcry_pubkey_spec_ecdh = ecc_decrypt_raw, NULL, NULL, - ecc_get_nbits - }; - - -pk_extra_spec_t _gcry_pubkey_extraspec_ecdsa = - { + ecc_get_nbits, run_selftests, ecc_generate_ext, compute_keygrip, |