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/pubkey-internal.h | |
| 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/pubkey-internal.h')
| -rw-r--r-- | cipher/pubkey-internal.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cipher/pubkey-internal.h b/cipher/pubkey-internal.h index a33ccfe6..0b20c7dc 100644 --- a/cipher/pubkey-internal.h +++ b/cipher/pubkey-internal.h @@ -20,7 +20,15 @@ #ifndef GCRY_PUBKEY_INTERNAL_H #define GCRY_PUBKEY_INTERNAL_H -/*-- rsa-common.h --*/ +/*-- pubkey-util.c --*/ +gpg_err_code_t _gcry_pk_util_get_nbits (gcry_sexp_t list, + unsigned int *r_nbits); +gpg_err_code_t _gcry_pk_util_get_rsa_use_e (gcry_sexp_t list, + unsigned long *r_e); + + + +/*-- rsa-common.c --*/ gpg_err_code_t _gcry_rsa_pkcs1_encode_for_enc (gcry_mpi_t *r_result, unsigned int nbits, const unsigned char *value, size_t valuelen, @@ -53,7 +61,7 @@ _gcry_rsa_pss_verify (gcry_mpi_t value, gcry_mpi_t encoded, -/*-- dsa-common.h --*/ +/*-- dsa-common.c --*/ gcry_mpi_t _gcry_dsa_gen_k (gcry_mpi_t q, int security_level); gpg_err_code_t _gcry_dsa_gen_rfc6979_k (gcry_mpi_t *r_k, gcry_mpi_t dsa_q, gcry_mpi_t dsa_x, |