security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

scd: fix merge failure.

Browse Source 
* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
merge.

--

Thanks to Joshua Rogers for reviewing and reporting.
This commit is contained in:
NIIBE Yutaka 2015-01-07 08:15:12 +09:00
parent 9bf40849a9
commit 602f17b5a7
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scd/apdu.c
View File

@ -2336,8 +2336,6 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
pin_verify, len, result, &resultlen); pin_verify, len, result, &resultlen);
xfree (pin_verify); xfree (pin_verify);
if (sw || resultlen < 2) 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); log_error ("control_pcsc failed: %d\n", sw);
return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE; return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE;