From 6e6d97db5fb4c6c2eada49e228fc98800c547f22 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 19 Nov 2010 23:43:12 +0900 Subject: [PATCH] DigestInfor by SHA256 supported --- ChangeLog | 4 ++++ src/openpgp.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7687b84..875cec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-14 NIIBE Yutaka + + * src/openpgp.c (cmd_pso): DigestInfo by SHA256 is supported. + 2010-11-12 NIIBE Yutaka * src/usb_desc.c (gnukConfigDescriptor): Change dwFeatures. diff --git a/src/openpgp.c b/src/openpgp.c index 10f7572..e5b3b0f 100644 --- a/src/openpgp.c +++ b/src/openpgp.c @@ -560,7 +560,9 @@ cmd_pso (void) return; } - if (cmd_APDU_size != 8 + 35 && cmd_APDU_size != 8 + 35 + 1) + if ((cmd_APDU_size != 8 + 35 && cmd_APDU_size != 8 + 35 + 1) /* SHA1 */ + /* or SHA256 */ + && (cmd_APDU_size != 8 + 51 && cmd_APDU_size != 8 + 51 + 1)) /* Extended Lc: 3-byte */ { DEBUG_INFO (" wrong length: "); @@ -569,7 +571,7 @@ cmd_pso (void) } else { - DEBUG_SHORT (len); /* Should be cmd_APDU_size - 6 */ + DEBUG_SHORT (len); /* Should be cmd_APDU_size - 8 [- 1] */ r = rsa_sign (&cmd_APDU[data_start], res_APDU, len); if (r < 0)