diff options
| author | Werner Koch <wk@gnupg.org> | 2013-10-08 17:59:50 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-10-08 17:59:50 +0200 |
| commit | 3816e46ce211e63adf46dbc775510aa137572248 (patch) | |
| tree | 7a4e51d84d2e0f83803f5865b58c8135f4a1ca5e /cipher/rsa.c | |
| parent | f79d3e13d3229115c47cbe5007647cb44105fe3f (diff) | |
| download | libgcrypt-3816e46ce211e63adf46dbc775510aa137572248.tar.gz | |
pubkey: Move sexp parsing for gcry_pk_getkey to the modules.
* cipher/pubkey-util.c: New.
(_gcry_pk_util_get_nbits): New. Based on code from gcry_pk_genkey.
(_gcry_pk_util_get_rsa_use_e): Ditto.
* cipher/pubkey.c (gcry_pk_genkey): Strip most code and pass.
* cipher/rsa.c (rsa_generate): Remove args ALGO, NBITS and EVALUE.
Call new fucntions to get these values.
* cipher/dsa.c (dsa_generate): Remove args ALGO, NBITS and EVALUE.
Call _gcry_pk_util_get_nbits to get nbits. Always parse genparms.
* cipher/elgamal.c (elg_generate): Ditto.
* cipher/ecc.c (ecc_generate): Ditto.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/rsa.c')
| -rw-r--r-- | cipher/rsa.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cipher/rsa.c b/cipher/rsa.c index 53b9d895..55f39e48 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -743,21 +743,28 @@ secret (gcry_mpi_t output, gcry_mpi_t input, RSA_secret_key *skey ) *********************************************/ static gcry_err_code_t -rsa_generate (int algo, unsigned int nbits, unsigned long evalue, - const gcry_sexp_t genparms, gcry_sexp_t *r_skey) +rsa_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) { - RSA_secret_key sk; gpg_err_code_t ec; + unsigned int nbits; + unsigned long evalue; + RSA_secret_key sk; gcry_sexp_t deriveparms; int transient_key = 0; int use_x931 = 0; gcry_sexp_t l1; gcry_sexp_t swap_info = NULL; - (void)algo; - memset (&sk, 0, sizeof sk); + ec = _gcry_pk_util_get_nbits (genparms, &nbits); + if (ec) + return ec; + + ec = _gcry_pk_util_get_rsa_use_e (genparms, &evalue); + if (ec) + return ec; + deriveparms = (genparms? gcry_sexp_find_token (genparms, "derive-parms", 0) : NULL); if (!deriveparms) |