NIIBE Yutaka 602f17b5a7 scd: fix merge failure. ...

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

--

Thanks to Joshua Rogers for reviewing and reporting.

2015-01-07 08:15:12 +09:00

..

apdu.c

scd: fix merge failure.

2015-01-07 08:15:12 +09:00

apdu.h

gpg: Add sub-command "factory-reset" to --card-edit.

2014-12-15 17:38:40 +01:00

app-common.h

scd: Support for SmartCard-HSM

2014-07-25 09:43:29 +02:00

app-dinsig.c

scd: Rename 'keypad' to 'pinpad'.

2013-02-08 09:06:39 +09:00

app-geldkarte.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

app-help.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

app-nks.c

scd: Suppress gcc warning about possible uninitialized use.

2013-08-30 10:28:26 +02:00

app-openpgp.c

scd: ECDH Support.

2014-12-22 09:27:00 +09:00

app-p15.c

scd: Fix int/short mismatch in format string of app-p15.c

2014-09-18 15:39:50 +02:00

app-sc-hsm.c

scd: Minor changes to app-sc-hsm.

2014-08-14 14:09:37 +02:00

app.c

gpg: Add sub-command "factory-reset" to --card-edit.

2014-12-15 17:38:40 +01:00

atr.c

Switch to the libgpg-error provided estream.

2014-08-26 17:47:54 +02:00

atr.h

scd: Add option --dump-atr to command APDU.

2011-12-15 15:21:02 +01:00

card-common.h

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

card-dinsig.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

card-p15.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

card.c

Change all quotes in strings and comments to the new GNU standard.

2012-06-05 19:29:22 +02:00

ccid-driver.c

scd: Add pinpad support for REINER SCT cyberJack go

2014-06-27 10:07:28 +02:00

ccid-driver.h

scd: Add pinpad support for REINER SCT cyberJack go

2014-06-27 10:07:28 +02:00

ChangeLog-2011

Generate the ChangeLog from commit logs.

2011-12-01 11:09:02 +01:00

command.c

scd: Avoid double-free on error condition in scd

2014-12-22 13:17:50 +01:00

iso7816.c

gpg: Add sub-command "factory-reset" to --card-edit.

2014-12-15 17:38:40 +01:00

iso7816.h

scd: Rename 'keypad' to 'pinpad'.

2013-02-08 09:06:39 +09:00

Makefile.am

Remove use of gnulib (part 1)

2014-11-11 10:13:10 +01:00

pcsc-wrapper.c

scd: Do not use the pcsc-wrapper.

2014-07-22 16:20:00 +02:00

sc-copykeys.c

SCD: API cleanup for keypad handling.

2013-02-05 13:37:06 +09:00

scdaemon-w32info.rc

w32: Add icons and version information.

2013-05-07 21:35:48 +02:00

scdaemon.c

gpg: Add sub-command "factory-reset" to --card-edit.

2014-12-15 17:38:40 +01:00

scdaemon.h

scd: Rename 'keypad' to 'pinpad'.

2013-02-08 09:06:39 +09:00