diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2019-06-21 05:05:27 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2019-09-19 11:36:11 +0200 |
| commit | 7c81e5cb97c77244be164daf7a80e29f6b6e437b (patch) | |
| tree | fdd8c6c72d779a3386fdc4e3b282d6105d6647a9 /tools/gpg-pair-tool.c | |
| parent | tools: Don't prepare G in gpg-pair-tool. (diff) | |
| download | gnupg2-7c81e5cb97c77244be164daf7a80e29f6b6e437b.tar.xz gnupg2-7c81e5cb97c77244be164daf7a80e29f6b6e437b.zip | |
tools: Fix gpg-pair-tool to follow new API.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'tools/gpg-pair-tool.c')
| -rw-r--r-- | tools/gpg-pair-tool.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tools/gpg-pair-tool.c b/tools/gpg-pair-tool.c index 666a0bc32..4a18b97bd 100644 --- a/tools/gpg-pair-tool.c +++ b/tools/gpg-pair-tool.c @@ -1028,6 +1028,9 @@ create_dh_keypair (unsigned char *dh_secret, size_t dh_secret_len, if (dh_public_len < 32 || dh_secret_len < 32) return gpg_error (GPG_ERR_BUFFER_TOO_SHORT); + if (gcry_ecc_get_algo_keylen (GCRY_ECC_CURVE25519) > dh_public_len) + return gpg_error (GPG_ERR_BUFFER_TOO_SHORT); + p = gcry_random_bytes (32, GCRY_VERY_STRONG_RANDOM); if (!p) return gpg_error_from_syserror (); @@ -1035,13 +1038,10 @@ create_dh_keypair (unsigned char *dh_secret, size_t dh_secret_len, memcpy (dh_secret, p, 32); xfree (p); - err = gcry_ecc_mul_point (GCRY_ECC_CURVE25519, &p, dh_secret, NULL); + err = gcry_ecc_mul_point (GCRY_ECC_CURVE25519, dh_public, dh_secret, NULL); if (err) return err; - memcpy (dh_public, p, 32); - xfree (p); - if (DBG_CRYPTO) { log_printhex (dh_secret, 32, "DH secret:"); @@ -1170,23 +1170,14 @@ compute_master_secret (unsigned char *master, size_t masterlen, const unsigned char *pk_b, size_t pk_b_len) { gpg_error_t err; - unsigned char *s; log_assert (masterlen == 32); log_assert (sk_a_len == 32); log_assert (pk_b_len == 32); - err = gcry_ecc_mul_point (GCRY_ECC_CURVE25519, &s, sk_a, pk_b); + err = gcry_ecc_mul_point (GCRY_ECC_CURVE25519, master, sk_a, pk_b); if (err) - { - log_error ("error computing DH: %s\n", gpg_strerror (err)); - goto leave; - } - - memcpy (master, s, 32); - - leave: - xfree (s); + log_error ("error computing DH: %s\n", gpg_strerror (err)); return err; } |