From bf30144144498e5ea303942ed5479c9759aa7fb7 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 3 Sep 2020 10:42:20 +0900 Subject: [PATCH] Remove Ed25519 signing condition against EDDSA_HASH_LEN_MAX. See GnuPG bug report: https://dev.gnupg.org/T5041 Signed-off-by: NIIBE Yutaka --- ChangeLog | 6 ++++++ src/openpgp.c | 14 -------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f60151..b96ccfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-09-03 NIIBE Yutaka + + * src/openpgp.c (cmd_internal_authenticate): Remove checking + against EDDSA_HASH_LEN_MAX. + (cmd_pso): Likewise. + 2020-08-28 NIIBE Yutaka * src/openpgp.c (cmd_reset_user_password): Add passphrase length diff --git a/src/openpgp.c b/src/openpgp.c index cb8354d..59c57cb 100644 --- a/src/openpgp.c +++ b/src/openpgp.c @@ -1005,13 +1005,6 @@ cmd_pso (struct eventflag *ccid_comm) { uint32_t output[64/4]; /* Require 4-byte alignment. */ - if (len > EDDSA_HASH_LEN_MAX) - { - DEBUG_INFO ("wrong hash length."); - GPG_CONDITION_NOT_SATISFIED (); - return; - } - cs = chopstx_setcancelstate (0); result_len = EDDSA_SIGNATURE_LENGTH; r = eddsa_sign_25519 (apdu.cmd_apdu_data, len, output, @@ -1218,13 +1211,6 @@ cmd_internal_authenticate (struct eventflag *ccid_comm) { uint32_t output[64/4]; /* Require 4-byte alignment. */ - if (len > EDDSA_HASH_LEN_MAX) - { - DEBUG_INFO ("wrong hash length."); - GPG_CONDITION_NOT_SATISFIED (); - return; - } - cs = chopstx_setcancelstate (0); result_len = EDDSA_SIGNATURE_LENGTH; r = eddsa_sign_25519 (apdu.cmd_apdu_data, len, output,