[git] GnuPG - branch, master, updated. gnupg-2.2.0-11-g2396055

[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  2396055c096884d521c26b76f26263a146207c24 (commit)
      from  ba8afc4966cca1f6aaf9b2a9bfc3220782306c2b (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 2396055c096884d521c26b76f26263a146207c24
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Sep 20 10:06:43 2017 +0900

    scd: Distinguish cancel by user and protocol error.
    
    * scd/apdu.h (SW_HOST_CANCELLED): New.
    * scd/apdu.c (host_sw_string): Support SW_HOST_CANCELLED.
    (pcsc_error_to_sw): Return SW_HOST_CANCELLED for PCSC_E_CANCELLED.
    * scd/iso7816.c (map_sw): Return GPG_ERR_INV_RESPONSE for
    SW_HOST_ABORTED and GPG_ERR_CANCELED for SW_HOST_CANCELLED.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/apdu.c b/scd/apdu.c
index 97624eb..1b25ceb 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -496,6 +496,7 @@ host_sw_string (long err)
     case SW_HOST_ABORTED: return "aborted";
     case SW_HOST_NO_PINPAD: return "no pinpad";
     case SW_HOST_ALREADY_CONNECTED: return "already connected";
+    case SW_HOST_CANCELLED: return "cancelled";
     default: return "unknown host status error";
     }
 }
@@ -602,7 +603,7 @@ pcsc_error_to_sw (long ec)
     {
     case 0:  rc = 0; break;
 
-    case PCSC_E_CANCELLED:           rc = SW_HOST_ABORTED; break;
+    case PCSC_E_CANCELLED:           rc = SW_HOST_CANCELLED; break;
     case PCSC_E_NO_MEMORY:           rc = SW_HOST_OUT_OF_CORE; break;
     case PCSC_E_TIMEOUT:             rc = SW_HOST_CARD_IO_ERROR; break;
     case PCSC_E_NO_SERVICE:
diff --git a/scd/apdu.h b/scd/apdu.h
index 6751e8c..8a0d4bd 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -71,7 +71,8 @@ enum {
   SW_HOST_NO_READER     = 0x1000c,
   SW_HOST_ABORTED       = 0x1000d,
   SW_HOST_NO_PINPAD     = 0x1000e,
-  SW_HOST_ALREADY_CONNECTED = 0x1000f
+  SW_HOST_ALREADY_CONNECTED = 0x1000f,
+  SW_HOST_CANCELLED     = 0x10010
 };
 
 struct dev_list;
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 081b080..29208c2 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -93,8 +93,9 @@ map_sw (int sw)
     case SW_HOST_CARD_IO_ERROR:  ec = GPG_ERR_EIO; break;
     case SW_HOST_GENERAL_ERROR:  ec = GPG_ERR_GENERAL; break;
     case SW_HOST_NO_READER:      ec = GPG_ERR_ENODEV; break;
-    case SW_HOST_ABORTED:        ec = GPG_ERR_CANCELED; break;
+    case SW_HOST_ABORTED:        ec = GPG_ERR_INV_RESPONSE; break;
     case SW_HOST_NO_PINPAD:      ec = GPG_ERR_NOT_SUPPORTED; break;
+    case SW_HOST_CANCELLED:      ec = GPG_ERR_CANCELED; break;
 
     default:
       if ((sw & 0x010000))

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

Summary of changes:
 scd/apdu.c    | 3 ++-
 scd/apdu.h    | 3 ++-
 scd/iso7816.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)


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