diff options
author | Werner Koch <wk@gnupg.org> | 2013-10-11 22:37:41 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-10-11 22:37:58 +0200 |
commit | a951c061523e1c13f1358c9760fc3a9d787ab2d4 (patch) | |
tree | 5ea15233dbeffa041c129920c6ab5fa93b40b75e /src/cipher-proto.h | |
parent | 07950c865a901afc48acb46f0695040cadfd5068 (diff) | |
download | libgcrypt-a951c061523e1c13f1358c9760fc3a9d787ab2d4.tar.gz |
pubkey: Move sexp parsing of remaining fucntions to the modules.
* cipher/pubkey.c (release_mpi_array): Remove.
(pubkey_check_secret_key): Remove.
(sexp_elements_extract): Remove.
(sexp_elements_extract_ecc): Remove.
(sexp_to_key): Remove.
(get_hash_algo): Remove.
(gcry_pk_testkey): Revamp.
(gcry_pk_get_curve): Revamp.
* cipher/rsa.c (rsa_check_secret_key): Revamp.
* cipher/elgamal.c (elg_check_secret_key): Revamp.
* cipher/dsa.c (dsa_check_secret_key): Revamp.
* cipher/ecc.c (ecc_check_secret_key): Revamp.
* cipher/ecc-curves.c: Include cipher.h and pubkey-internal.h
(_gcry_ecc_get_curve): Revamp.
* cipher/pubkey-util.c (_gcry_pk_util_extract_mpis): Set passed and
used parameters on error to NULL.
--
That is the final part of the changes modulo introduced regressions.
pubkey.c is now actually maintainable code.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/cipher-proto.h')
-rw-r--r-- | src/cipher-proto.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cipher-proto.h b/src/cipher-proto.h index 0dc83bd1..c7ce9060 100644 --- a/src/cipher-proto.h +++ b/src/cipher-proto.h @@ -54,8 +54,7 @@ typedef gcry_err_code_t (*gcry_pk_generate_t) (gcry_sexp_t genparms, gcry_sexp_t *r_skey); /* Type for the pk_check_secret_key function. */ -typedef gcry_err_code_t (*gcry_pk_check_secret_key_t) (int algo, - gcry_mpi_t *skey); +typedef gcry_err_code_t (*gcry_pk_check_secret_key_t) (gcry_sexp_t keyparms); /* Type for the pk_encrypt function. */ typedef gcry_err_code_t (*gcry_pk_encrypt_t) (gcry_sexp_t *r_ciph, @@ -90,7 +89,7 @@ typedef gcry_err_code_t (*pk_get_param_t) (const char *name, gcry_mpi_t *pkey); /* The type used to query an ECC curve name. */ -typedef const char *(*pk_get_curve_t)(gcry_mpi_t *pkey, int iterator, +typedef const char *(*pk_get_curve_t)(gcry_sexp_t keyparms, int iterator, unsigned int *r_nbits); /* The type used to query ECC curve parameters by name. */ |