[git] GnuPG - branch, master, updated. gnupg-2.1.1-25-g602f17b

[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  602f17b5a775f02e0e33a54d3155929dc00e4f53 (commit)
      from  9bf40849a9f86204e113712c4cc285f1ac16127a (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 602f17b5a775f02e0e33a54d3155929dc00e4f53
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Jan 7 08:15:12 2015 +0900

    scd: fix merge failure.
    
    * scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
    merge.
    
    --
    
    Thanks to Joshua Rogers for reviewing and reporting.

diff --git a/scd/apdu.c b/scd/apdu.c
index 476723a..4ec6b4d 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2336,8 +2336,6 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
                      pin_verify, len, result, &resultlen);
   xfree (pin_verify);
   if (sw || resultlen < 2)
-    return sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE;
-  sw = (result[resultlen-2] << 8) | result[resultlen-1];
     {
       log_error ("control_pcsc failed: %d\n", sw);
       return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE;

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

Summary of changes:
 scd/apdu.c |    2 --
 1 file changed, 2 deletions(-)


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