[git] GnuPG - branch, master, updated. gnupg-2.2.7-379-gbd15aa3

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  bd15aa34ab8ad10adbb7540a8845b4a2600437b6 (commit)
      from  64b7c6fd1945bc206cf56979633dfca8a7494374 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd15aa34ab8ad10adbb7540a8845b4a2600437b6
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Feb 21 15:16:11 2019 +0900

    scd: Handle ack button timeout as GPG_ERR_TIMEOUT.
    
    * scd/apdu.h (SW_ACK_TIMEOUT): New.
    * scd/iso7816.c (map_sw): Return GPG_ERR_TIMEOUT for SW_ACK_TIMEOUT.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/apdu.h b/scd/apdu.h
index 1392aab..89df45c 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -31,6 +31,7 @@ enum {
   SW_EOF_REACHED    = 0x6282,
   SW_TERM_STATE     = 0x6285, /* Selected file is in termination state.  */
   SW_EEPROM_FAILURE = 0x6581,
+  SW_ACK_TIMEOUT    = 0x6600, /* OpenPGPcard: Ack timeout.  */
   SW_WRONG_LENGTH   = 0x6700,
   SW_SM_NOT_SUP     = 0x6882, /* Secure Messaging is not supported.  */
   SW_CC_NOT_SUP     = 0x6884, /* Command Chaining is not supported.  */
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 758de5b..a9cd730 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -67,6 +67,7 @@ map_sw (int sw)
     case SW_EEPROM_FAILURE: ec = GPG_ERR_HARDWARE; break;
     case SW_TERM_STATE:     ec = GPG_ERR_OBJ_TERM_STATE; break;
     case SW_WRONG_LENGTH:   ec = GPG_ERR_INV_VALUE; break;
+    case SW_ACK_TIMEOUT:    ec = GPG_ERR_TIMEOUT; break;
     case SW_SM_NOT_SUP:     ec = GPG_ERR_NOT_SUPPORTED; break;
     case SW_CC_NOT_SUP:     ec = GPG_ERR_NOT_SUPPORTED; break;
     case SW_CHV_WRONG:      ec = GPG_ERR_BAD_PIN; break;

-----------------------------------------------------------------------

Summary of changes:
 scd/apdu.h    | 1 +
 scd/iso7816.c | 1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org