From 90a5b4e648b3c8a6fe645df7e61654dfdb3548be Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 24 Mar 2021 14:51:42 +0900 Subject: 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 --- g10/pubkey-enc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'g10/pubkey-enc.c') 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); -- cgit v1.2.3