diff options
author | Werner Koch <wk@gnupg.org> | 2013-07-17 15:54:32 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-07-17 15:54:32 +0200 |
commit | 5940e66cbefea3de5924f494f18aed69bb694bff (patch) | |
tree | 054fe254b2bd012281e57d594455754c5309c91c /cipher | |
parent | 6e1adb05d290aeeb1c230c763970695f4a538526 (diff) | |
download | libgcrypt-5940e66cbefea3de5924f494f18aed69bb694bff.tar.gz |
cipher: Prepare to pass extra info to the sign functions.
* src/gcrypt-module.h (gcry_pk_sign_t): Add parms flags and hashalgo.
* cipher/rsa.c (rsa_sign): Add parms and mark them as unused.
* cipher/dsa.c (dsa_sign): Ditto.
* cipher/elgamal.c (elg_sign): Ditto.
* cipher/pubkey.c (dummy_sign): Ditto.
(pubkey_sign): Pass 0 for the new args.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher')
-rw-r--r-- | cipher/dsa.c | 5 | ||||
-rw-r--r-- | cipher/ecc.c | 5 | ||||
-rw-r--r-- | cipher/elgamal.c | 5 | ||||
-rw-r--r-- | cipher/pubkey.c | 8 | ||||
-rw-r--r-- | cipher/rsa.c | 5 |
5 files changed, 22 insertions, 6 deletions
diff --git a/cipher/dsa.c b/cipher/dsa.c index 90edeb5a..55805e21 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -906,12 +906,15 @@ dsa_check_secret_key (int algo, gcry_mpi_t *skey) static gcry_err_code_t -dsa_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey) +dsa_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey, + int flags, int hashalgo) { gcry_err_code_t err = GPG_ERR_NO_ERROR; DSA_secret_key sk; (void)algo; + (void)flags; + (void)hashalgo; if ((! data) || (! skey[0]) || (! skey[1]) || (! skey[2]) diff --git a/cipher/ecc.c b/cipher/ecc.c index e5a925b1..e4b1799e 100644 --- a/cipher/ecc.c +++ b/cipher/ecc.c @@ -1317,12 +1317,15 @@ ecc_check_secret_key (int algo, gcry_mpi_t *skey) static gcry_err_code_t -ecc_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey) +ecc_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey, + int flags, int hashalgo) { gpg_err_code_t err; ECC_secret_key sk; (void)algo; + (void)flags; + (void)hashalgo; if (!data || !skey[0] || !skey[1] || !skey[2] || !skey[3] || !skey[4] || !skey[6] ) diff --git a/cipher/elgamal.c b/cipher/elgamal.c index ce4be852..128dd997 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -753,12 +753,15 @@ elg_decrypt (int algo, gcry_mpi_t *result, static gcry_err_code_t -elg_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey) +elg_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey, + int flags, int hashalgo) { gcry_err_code_t err = GPG_ERR_NO_ERROR; ELG_secret_key sk; (void)algo; + (void)flags; + (void)hashalgo; if ((! data) || (! skey[0]) || (! skey[1]) || (! skey[2]) || (! skey[3])) diff --git a/cipher/pubkey.c b/cipher/pubkey.c index 378e0724..23a43589 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -161,12 +161,16 @@ dummy_decrypt (int algorithm, gcry_mpi_t *result, gcry_mpi_t *data, static gcry_err_code_t dummy_sign (int algorithm, gcry_mpi_t *resarr, gcry_mpi_t data, - gcry_mpi_t *skey) + gcry_mpi_t *skey, + int flags, int hashalgo) + { (void)algorithm; (void)resarr; (void)data; (void)skey; + (void)flags; + (void)hashalgo; fips_signal_error ("using dummy public key function"); return GPG_ERR_NOT_IMPLEMENTED; } @@ -728,7 +732,7 @@ pubkey_sign (int algorithm, gcry_mpi_t *resarr, gcry_mpi_t data, if (module) { pubkey = (gcry_pk_spec_t *) module->spec; - rc = pubkey->sign (algorithm, resarr, data, skey); + rc = pubkey->sign (algorithm, resarr, data, skey, 0, 0); _gcry_module_release (module); goto ready; } diff --git a/cipher/rsa.c b/cipher/rsa.c index ccc9f964..4787f813 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -993,11 +993,14 @@ rsa_decrypt (int algo, gcry_mpi_t *result, gcry_mpi_t *data, static gcry_err_code_t -rsa_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey) +rsa_sign (int algo, gcry_mpi_t *resarr, gcry_mpi_t data, gcry_mpi_t *skey, + int flags, int hashalgo) { RSA_secret_key sk; (void)algo; + (void)flags; + (void)hashalgo; sk.n = skey[0]; sk.e = skey[1]; |