diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-24 06:51:42 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-24 06:51:42 +0100 |
| commit | 90a5b4e648b3c8a6fe645df7e61654dfdb3548be (patch) | |
| tree | a65af8e22cd850bbe98976a943f8539704955250 /g10/pubkey-enc.c | |
| parent | gpgconf: Fix listing of default_pubkey_algo. (diff) | |
| download | gnupg2-90a5b4e648b3c8a6fe645df7e61654dfdb3548be.tar.xz gnupg2-90a5b4e648b3c8a6fe645df7e61654dfdb3548be.zip | |
gpg: Support ECDH with v5 key.
* g10/ecdh.c (build_kdf_params): Use the first 20 octets.
* g10/pkglue.c (pk_encrypt): Remove length check to 20.
* g10/pubkey-enc.c (get_it): Likewise.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'g10/pubkey-enc.c')
| -rw-r--r-- | g10/pubkey-enc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index 9a2c107f8..6e1b0898e 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -201,7 +201,6 @@ get_it (ctrl_t ctrl, char *desc; char *keygrip; byte fp[MAX_FINGERPRINT_LEN]; - size_t fpn; if (DBG_CLOCK) log_clock ("decryption start"); @@ -245,10 +244,7 @@ get_it (ctrl_t ctrl, goto leave; if (sk->pubkey_algo == PUBKEY_ALGO_ECDH) - { - fingerprint_from_pk (sk, fp, &fpn); - log_assert (fpn == 20); - } + fingerprint_from_pk (sk, fp, NULL); /* Decrypt. */ desc = gpg_format_keydesc (ctrl, sk, FORMAT_KEYDESC_NORMAL, 1); |