diff options
| author | Werner Koch <wk@gnupg.org> | 2013-09-07 10:06:46 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-09-19 16:43:33 +0200 |
| commit | 1bf08850bf9343146c938bc03917417e16393e9a (patch) | |
| tree | e045f1721f71ebb6769e2048bf8d53e7d39a0320 /src/cipher-proto.h | |
| parent | 2fe084873333c4d67bcfba0b527d63cd3cff6c47 (diff) | |
| download | libgcrypt-1bf08850bf9343146c938bc03917417e16393e9a.tar.gz | |
pk: Move s-expr creation for genkey to the modules.
* cipher/pubkey.c (pubkey_generate): Fold into gcry_pk_genkey
(gcry_pk_genkey): Move result s-exp creation into the modules.
* cipher/dsa.c (dsa_generate): Create result as s-exp.
* cipher/elgamal.c (elg_generate): Ditto.
* cipher/rsa.c (rsa_generate): Ditto.
* cipher/ecc.c (ecc_generate): Ditto.
* src/cipher-proto.h (pk_ext_generate_t): Remove type
(gcry_pk_spec): and remove from struct.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/cipher-proto.h')
| -rw-r--r-- | src/cipher-proto.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/cipher-proto.h b/src/cipher-proto.h index 121d9f57..1285fe85 100644 --- a/src/cipher-proto.h +++ b/src/cipher-proto.h @@ -49,18 +49,10 @@ typedef gpg_err_code_t (*selftest_func_t) /* Type for the pk_generate function. */ typedef gcry_err_code_t (*gcry_pk_generate_t) (int algo, - unsigned int nbits, - unsigned long use_e, - gcry_mpi_t *skey, - gcry_mpi_t **retfactors); -/* Type for the extended generate function. */ -typedef gcry_err_code_t (*pk_ext_generate_t) (int algo, - unsigned int nbits, - unsigned long evalue, - gcry_sexp_t genparms, - gcry_mpi_t *skey, - gcry_mpi_t **retfactors, - gcry_sexp_t *extrainfo); + unsigned int nbits, + unsigned long evalue, + 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, @@ -143,7 +135,6 @@ typedef struct gcry_pk_spec gcry_pk_verify_t verify; gcry_pk_get_nbits_t get_nbits; selftest_func_t selftest; - pk_ext_generate_t ext_generate; pk_comp_keygrip_t comp_keygrip; pk_get_param_t get_param; pk_get_curve_t get_curve; |