diff options
| author | Werner Koch <wk@gnupg.org> | 2013-10-11 21:13:12 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-10-11 21:13:12 +0200 |
| commit | 07950c865a901afc48acb46f0695040cadfd5068 (patch) | |
| tree | d608acf3116831d6a8874caa4686efcd44f87b9e /src/cipher-proto.h | |
| parent | 6bd5d18c45a4a3ce8f0f66f56c83b80594877f53 (diff) | |
| download | libgcrypt-07950c865a901afc48acb46f0695040cadfd5068.tar.gz | |
pubkey: Move sexp parsing for gcry_pk_decrypt to the modules.
* cipher/rsa.c (rsa_decrypt): Revamp.
* cipher/elgamal.c (elg_decrypt): Revamp.
* cipher/ecc.c (ecc_decrypt_raw): Revamp.
* cipher/pubkey.c (gcry_pk_decrypt): Simplify.
(sexp_to_enc): Remove.
* cipher/pubkey-util.c (_gcry_pk_util_preparse_encval): New.
--
Note that we do not have a regression test for ecc_decrypt_raw. Even
GnuPG does not use it. we also better check whether the interface is
really usable; for example GnuPG implements way to much low-level ECC
code. Maybe we should move the OpenPGP ECC encryption code into
Libgcrypt.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/cipher-proto.h')
| -rw-r--r-- | src/cipher-proto.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/cipher-proto.h b/src/cipher-proto.h index c570e5ff..0dc83bd1 100644 --- a/src/cipher-proto.h +++ b/src/cipher-proto.h @@ -63,15 +63,9 @@ typedef gcry_err_code_t (*gcry_pk_encrypt_t) (gcry_sexp_t *r_ciph, gcry_sexp_t keyparms); /* Type for the pk_decrypt function. */ -typedef gcry_err_code_t (*gcry_pk_decrypt_t) (int algo, - gcry_sexp_t *r_result, - gcry_mpi_t *data, - gcry_mpi_t *skey, - int flags, - enum pk_encoding encoding, - int hash_algo, - unsigned char *label, - size_t labellen); +typedef gcry_err_code_t (*gcry_pk_decrypt_t) (gcry_sexp_t *r_plain, + gcry_sexp_t s_data, + gcry_sexp_t keyparms); /* Type for the pk_sign function. */ typedef gcry_err_code_t (*gcry_pk_sign_t) (gcry_sexp_t *r_sig, |