1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-31 20:08:43 +01:00
gnupg/scd
Werner Koch 36373798c0
Merge branch 'STABLE-BRANCH-2-2' into master
--
Fixed conflicts:
  NEWS            - keep master
  configure.ac    - merge
  g10/card-util.c - mostly 2.2
  g10/sig-check.c - 2.2
2018-04-10 10:14:30 +02:00
..
apdu.c Merge branch 'STABLE-BRANCH-2-2' into master 2018-03-27 08:48:00 +02:00
apdu.h scd: Distinguish cancel by user and protocol error. 2017-09-20 10:06:43 +09:00
app-common.h scd: Fix RESET command handling (more). 2017-02-17 11:50:40 +09:00
app-dinsig.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
app-geldkarte.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
app-help.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
app-nks.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
app-openpgp.c Merge branch 'STABLE-BRANCH-2-2' into master 2018-04-10 10:14:30 +02:00
app-p15.c Use the gpgrt log functions if possible. 2017-11-27 15:00:25 +01:00
app-sc-hsm.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
app.c scd: Enable card removal check after select_application. 2017-11-21 12:19:15 +09:00
atr.c Spelling fixes in docs and comments. 2017-04-28 10:06:33 +09:00
atr.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
ccid-driver.c scd: Fix suspend/resume handling for CCID driver. 2018-03-15 23:59:22 +09:00
ccid-driver.h scd: Fix GetSlotStatus. 2017-01-30 09:32:03 +09:00
ChangeLog-2011 Generate the ChangeLog from commit logs. 2011-12-01 11:09:02 +01:00
command.c agent,scd: Use pointer to represent HANDLE. 2018-03-27 16:24:17 +09:00
iso7816.c scd: Distinguish cancel by user and protocol error. 2017-09-20 10:06:43 +09:00
iso7816.h scd: Fix API of select_file/_path. 2017-03-06 13:39:46 +09:00
Makefile.am Remove -I option to common. 2017-03-07 20:25:54 +09:00
scdaemon-w32info.rc w32: Add icons and version information. 2013-05-07 21:35:48 +02:00
scdaemon.c scd: signal mask should be set just after npth_init. 2018-03-19 16:36:30 +09:00
scdaemon.h scd: Fix regression tracking the connection count. 2017-02-01 08:58:01 +09:00