[git] GnuPG - branch, master, updated. gnupg-2.1.2-3-g07a71da

[by Werner Koch]

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  07a71da479daaac43b8c5b1034a1e66f96bdbc48 (commit)
      from  070d7bf940efa60db2b0734273b9b3736d18338a (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 07a71da479daaac43b8c5b1034a1e66f96bdbc48
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Feb 12 20:40:39 2015 +0100

    scd: Fix regression in 2.1.2 (due to commit 2183683)
    
    * scd/apdu.c (pcsc_vendor_specific_init): Replace use of
    bufNN_to_uint by direct code.
    --
    
    Hey, that was little endian.

diff --git a/scd/apdu.c b/scd/apdu.c
index e5db4f0..5e7d27b 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1851,9 +1851,9 @@ pcsc_vendor_specific_init (int slot)
       if (l == 1)
         v = p[0];
       else if (l == 2)
-        v = buf16_to_uint (p);
+        v = (((unsigned int)p[1] << 8) | p[0]);
       else if (l == 4)
-        v = buf32_to_uint (p);
+        v = (((unsigned int)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
 
       if (tag == PCSCv2_PART10_PROPERTY_bMinPINSize)
         reader_table[slot].pcsc.pinmin = v;

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

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


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