aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-02-12 19:40:39 +0000
committerWerner Koch <[email protected]>2015-02-12 19:40:39 +0000
commit07a71da479daaac43b8c5b1034a1e66f96bdbc48 (patch)
tree0c4cfd48cd295c4019a0f0e6aa889e47b1846dce
parentdirmngr: Initialize cache from sysconfig dir (diff)
downloadgnupg-07a71da479daaac43b8c5b1034a1e66f96bdbc48.tar.gz
gnupg-07a71da479daaac43b8c5b1034a1e66f96bdbc48.zip
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.
-rw-r--r--scd/apdu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scd/apdu.c b/scd/apdu.c
index e5db4f096..5e7d27bb6 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;