diff options
| author | NIIBE Yutaka <[email protected]> | 2015-01-06 23:15:12 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-01-06 23:15:12 +0000 |
| commit | 602f17b5a775f02e0e33a54d3155929dc00e4f53 (patch) | |
| tree | 93e5b9fa1027bed0349f28c2fcd3cd681499875e /scd/apdu.c | |
| parent | sm,g13: Init local vars to avoid compiler warnings. (diff) | |
| download | gnupg-602f17b5a775f02e0e33a54d3155929dc00e4f53.tar.gz gnupg-602f17b5a775f02e0e33a54d3155929dc00e4f53.zip | |
scd: fix merge failure.
* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
merge.
--
Thanks to Joshua Rogers for reviewing and reporting.
Diffstat (limited to 'scd/apdu.c')
| -rw-r--r-- | scd/apdu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 476723a38..4ec6b4d00 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; |