diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2019-10-22 13:29:13 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2019-10-22 13:29:13 +0900 |
| commit | 6a30a9a2cc48d2343c3e9815567dbd4bf9eec058 (patch) | |
| tree | 250b84238bb801ec54148b181a7a825aab6b9d3e /cipher/ecc-common.h | |
| parent | 975de38796917392e83152447c6575648a5a5ee3 (diff) | |
| download | libgcrypt-6a30a9a2cc48d2343c3e9815567dbd4bf9eec058.tar.gz | |
ecc: Simplify using mpi_ec_t directly.
* cipher/ecc-common.h (ECC_public_key, ECC_secret_key): Remove.
(_gcry_ecc_ecdsa_sign, _gcry_ecc_ecdsa_verify): Use mpi_ec_t.
(_gcry_ecc_eddsa_genkey, gcry_ecc_eddsa_sign): Likewise.
(_gcry_ecc_eddsa_verify): Likewise.
(_gcry_ecc_gost_sign, _gcry_ecc_gost_verify): Likewise.
* cipher/ecc-ecdsa.c (_gcry_ecc_ecdsa_sign): Use mpi_ec_t directly.
(_gcry_ecc_ecdsa_verify): Likewise.
* cipher/ecc-eddsa.c (_gcry_ecc_eddsa_genkey): Likewise.
(_gcry_ecc_eddsa_sign, _gcry_ecc_eddsa_verify): Likewise.
* cipher/ecc-gost.c (_gcry_ecc_gost_sign): Likewise.
(_gcry_ecc_gost_verify): Likewise.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'cipher/ecc-common.h')
| -rw-r--r-- | cipher/ecc-common.h | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/cipher/ecc-common.h b/cipher/ecc-common.h index 59c6d351..08582c50 100644 --- a/cipher/ecc-common.h +++ b/cipher/ecc-common.h @@ -37,21 +37,6 @@ typedef struct } elliptic_curve_t; -typedef struct -{ - elliptic_curve_t E; - mpi_point_struct Q; /* Q = [d]G */ -} ECC_public_key; - - -typedef struct -{ - elliptic_curve_t E; - mpi_point_struct Q; - gcry_mpi_t d; -} ECC_secret_key; - - /* Set the value from S into D. */ static inline void @@ -101,10 +86,10 @@ gpg_err_code_t _gcry_ecc_mont_encodepoint (gcry_mpi_t x, unsigned int nbits, /*-- ecc.c --*/ /*-- ecc-ecdsa.c --*/ -gpg_err_code_t _gcry_ecc_ecdsa_sign (gcry_mpi_t input, ECC_secret_key *skey, +gpg_err_code_t _gcry_ecc_ecdsa_sign (gcry_mpi_t input, mpi_ec_t ec, gcry_mpi_t r, gcry_mpi_t s, int flags, int hashalgo); -gpg_err_code_t _gcry_ecc_ecdsa_verify (gcry_mpi_t input, ECC_public_key *pkey, +gpg_err_code_t _gcry_ecc_ecdsa_verify (gcry_mpi_t input, mpi_ec_t ec, gcry_mpi_t r, gcry_mpi_t s); /*-- ecc-eddsa.c --*/ @@ -122,25 +107,22 @@ gpg_err_code_t _gcry_ecc_eddsa_ensure_compact (gcry_mpi_t value, gpg_err_code_t _gcry_ecc_eddsa_compute_h_d (unsigned char **r_digest, gcry_mpi_t d, mpi_ec_t ec); -gpg_err_code_t _gcry_ecc_eddsa_genkey (ECC_secret_key *sk, - elliptic_curve_t *E, - mpi_ec_t ctx, - int flags); +gpg_err_code_t _gcry_ecc_eddsa_genkey (mpi_ec_t ec, int flags); gpg_err_code_t _gcry_ecc_eddsa_sign (gcry_mpi_t input, - ECC_secret_key *sk, + mpi_ec_t ec, gcry_mpi_t r_r, gcry_mpi_t s, - int hashalgo, gcry_mpi_t pk); + int hashalgo); gpg_err_code_t _gcry_ecc_eddsa_verify (gcry_mpi_t input, - ECC_public_key *pk, + mpi_ec_t ec, gcry_mpi_t r, gcry_mpi_t s, - int hashalgo, gcry_mpi_t pkmpi); + int hashalgo); void reverse_buffer (unsigned char *buffer, unsigned int length); /*-- ecc-gost.c --*/ -gpg_err_code_t _gcry_ecc_gost_sign (gcry_mpi_t input, ECC_secret_key *skey, +gpg_err_code_t _gcry_ecc_gost_sign (gcry_mpi_t input, mpi_ec_t ec, gcry_mpi_t r, gcry_mpi_t s); -gpg_err_code_t _gcry_ecc_gost_verify (gcry_mpi_t input, ECC_public_key *pkey, +gpg_err_code_t _gcry_ecc_gost_verify (gcry_mpi_t input, mpi_ec_t ec, gcry_mpi_t r, gcry_mpi_t s); |