Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libchipcard for openSUSE:Factory checked in at 2021-09-27 20:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libchipcard (Old) and /work/SRC/openSUSE:Factory/.libchipcard.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libchipcard" Mon Sep 27 20:08:51 2021 rev:22 rq:921547 version:5.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libchipcard/libchipcard.changes 2021-06-09 21:53:17.714580954 +0200 +++ /work/SRC/openSUSE:Factory/.libchipcard.new.1899/libchipcard.changes 2021-09-27 20:09:08.774477838 +0200 @@ -1,0 +2,8 @@ +Fri Sep 24 18:21:27 UTC 2021 - Johannes Engel <[email protected]> + +- Update to 5.1.6 + + Changed project URL + + Code cleanup + + Small bugfixes + +------------------------------------------------------------------- Old: ---- libchipcard-5.1.5rc2.tar.gz New: ---- libchipcard-5.1.6.tar.gz libchipcard-5.1.6.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchipcard.spec ++++++ --- /var/tmp/diff_new_pack.PK8skt/_old 2021-09-27 20:09:09.306478424 +0200 +++ /var/tmp/diff_new_pack.PK8skt/_new 2021-09-27 20:09:09.306478424 +0200 @@ -17,15 +17,15 @@ Name: libchipcard -Version: 5.1.5 +Version: 5.1.6 Release: 0 -%define _version 5.1.5rc2 +%define _version 5.1.6 Summary: Library That Allows Access to Smart Cards (Chipcards) License: GPL-2.0-or-later Group: Hardware/Other -URL: http://www.aquamaniac.de/sites/libchipcard/index.php -Source: %{name}-%{_version}.tar.gz -#Source: https://www.aquamaniac.de/rdm/attachments/download/229/libchipcard-5.1.5rc2.tar.gz +URL: https://www.aquamaniac.de/rdm/projects/libchipcard/ +Source: https://www.aquamaniac.de/rdm/attachments/download/382/libchipcard-5.1.6.tar.gz +Source1: https://www.aquamaniac.de/rdm/attachments/download/381/libchipcard-5.1.6.tar.gz.asc Source100: libchipcard-rpmlintrc Patch0: libchipcard-buildsrcdoc.patch BuildRequires: doxygen ++++++ libchipcard-5.1.5rc2.tar.gz -> libchipcard-5.1.6.tar.gz ++++++ ++++ 3361 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/ChangeLog new/libchipcard-5.1.6/ChangeLog --- old/libchipcard-5.1.5rc2/ChangeLog 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/ChangeLog 2021-09-17 17:45:43.000000000 +0200 @@ -1,4 +1,49 @@ ------------------------------------------------------------------ +2021-09-17 17:45:33 +0200 Martin Preuss +Prepared release 5.1.6. + +------------------------------------------------------------------ +2021-09-11 18:09:45 +0200 Martin Preuss +chiptanusb ct plugin: Use correct log domain. Removed _p.h file, add *.h file. + +------------------------------------------------------------------ +2021-09-11 18:08:30 +0200 Martin Preuss +chiptanusb CT plugin: Create correct plugin object (fixes #213). +The crypt token functions inside gwen expect the plugin to be derived +from GWEN_Crypt_Token_Plugin. + +------------------------------------------------------------------ +2021-03-01 21:32:18 +0100 Micha Lenk +README.cards: Add a hint about its required presence on target systems + +------------------------------------------------------------------ +2021-02-26 14:13:37 +0100 Micha Lenk +Fix several autoconf/automake warnings + +------------------------------------------------------------------ +2021-02-26 13:23:32 +0100 Micha Lenk +Fix off-by-one errors + +------------------------------------------------------------------ +2020-01-27 21:01:32 +0100 Micha Lenk +Add missing include +The missing include of ctype.h was found via the following warning by the +Debian buildd log scanner. + +main.c: In function ???_readBytesHex???: +main.c:347:9: warning: implicit declaration of function ???toupper??? [-Wimplicit-function-declaration] + 347 | c = toupper(c); + | ^~~~~~~ + +------------------------------------------------------------------ +2020-01-18 10:57:31 +0100 Herbert Ellebruch +Correct ATR for Tanjackbluetooth, Description building APDU for chiptan USB + +------------------------------------------------------------------ +2020-01-17 20:14:18 +0100 Martin Preuss +Changed prefix to "/usr/local". + +------------------------------------------------------------------ 2020-01-12 17:15:49 +0100 Martin Preuss Prepared release 5.1.5rc2. @@ -435,63 +480,3 @@ read. git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@585 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:35 +0000 martin -Fixed some commands for ZKA cards. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@584 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:33 +0000 martin -Renamed some zkacard xml files. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@583 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:31 +0000 martin -Added log messages after execution of APDUs. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@582 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:29 +0000 martin -LC_Card_ReadBinary: Added a check for end of data. -The special response 82/82 is now recognized (this flags the end of data -which isn't in every case an error. In cases were we don't now in advance -the data size to read the read command simply stops now at EOF). - -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@581 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:27 +0000 martin -Added new friendly name of those cyberJacks to reader description file. -Unfortunately Reiner SCT decided to change the friendly names of their readers -so the current comparison strings don't match anymore. As a result cyberJacks -aren't recognized as such but as generic CCID readers. However, this isn't -much of a problem because the commands are mostly the same. - -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@580 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 16:57:25 +0000 martin -Fixed a problem with command PerformVerification_Ascii. -Maybe we will have to work more on that one, but for now verfication of the -PIN of a SECCOS card is possible. - -However, changing the PIN is not yet possible with those cards, but I will -address that one later. - -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@579 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 13:33:35 +0000 martin -Started working on SECCOS support. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@578 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-11-13 13:33:30 +0000 martin -Added gource script. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@577 bfc04c16-8f10-0410-8200-ddfbc4d55d47 - ------------------------------------------------------------------- -2010-08-30 15:08:40 +0000 martin -Prepared release 5.0.0. -git-svn-id: https://devel.aqbanking.de/svn/libchipcard/trunk@576 bfc04c16-8f10-0410-8200-ddfbc4d55d47 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/configure.ac new/libchipcard-5.1.6/configure.ac --- old/libchipcard-5.1.5rc2/configure.ac 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/configure.ac 2021-09-17 17:43:10.000000000 +0200 @@ -16,9 +16,9 @@ CHIPCARD_VERSION_MAJOR=5 CHIPCARD_VERSION_MINOR=1 -CHIPCARD_VERSION_PATCHLEVEL=5 +CHIPCARD_VERSION_PATCHLEVEL=6 CHIPCARD_VERSION_BUILD=0 -CHIPCARD_VERSION_TAG="rc2" +CHIPCARD_VERSION_TAG="stable" CHIPCARD_VERSION_FULL_STRING="$CHIPCARD_VERSION_MAJOR.$CHIPCARD_VERSION_MINOR.$CHIPCARD_VERSION_PATCHLEVEL.$CHIPCARD_VERSION_BUILD${CHIPCARD_VERSION_TAG}" CHIPCARD_VERSION_STRING="$CHIPCARD_VERSION_MAJOR.$CHIPCARD_VERSION_MINOR.$CHIPCARD_VERSION_PATCHLEVEL" @@ -28,7 +28,7 @@ # LIBCHIPCARD_SO_CURRENT=7 LIBCHIPCARD_SO_AGE=1 -LIBCHIPCARD_SO_REVISION=5 +LIBCHIPCARD_SO_REVISION=6 LIBCHIPCARD_SO_EFFECTIVE="`echo \$(($LIBCHIPCARD_SO_CURRENT-$LIBCHIPCARD_SO_AGE))`" # @@ -104,7 +104,7 @@ # AC_MSG_CHECKING(for installation prefix) -AC_PREFIX_DEFAULT(/usr) +AC_PREFIX_DEFAULT(/usr/local) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix ac_configure_args="$ac_configure_args --prefix $prefix" @@ -143,9 +143,9 @@ AC_PROG_CXX AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_LIBTOOL AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_RC -AC_PROG_LIBTOOL AC_CHECK_PROG(SED,sed,sed) PKG_PROG_PKG_CONFIG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/libchipcard.spec new/libchipcard-5.1.6/libchipcard.spec --- old/libchipcard-5.1.5rc2/libchipcard.spec 2020-01-12 17:22:59.000000000 +0100 +++ new/libchipcard-5.1.6/libchipcard.spec 2021-09-17 17:43:28.000000000 +0200 @@ -1,5 +1,5 @@ %define name libchipcard -%define version 5.1.5rc2 +%define version 5.1.6 %define rpm_cxxflags \"-O2 -march=i486 -mcpu=i586\" %define rpm_cflags \"-O2 -march=i486 -mcpu=i586\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/chiptanusb/Makefile.am new/libchipcard-5.1.6/src/ct/chiptanusb/Makefile.am --- old/libchipcard-5.1.5rc2/src/ct/chiptanusb/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/chiptanusb/Makefile.am 2021-09-11 17:53:32.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards crypttokenplugindir=$(gwenhywfar_plugins)/ct crypttokenplugin_DATA=chiptanusb.xml @@ -9,8 +9,8 @@ crypttokenplugin_LTLIBRARIES=chiptanusb.la -noinst_HEADERS=\ - chiptanusb_p.h +noinst_HEADERS= \ + chiptanusb.h chiptanusb_la_SOURCES=dummy.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb.c new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb.c --- old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb.c 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb.c 2021-09-11 17:59:48.000000000 +0200 @@ -12,7 +12,7 @@ # include <config.h> #endif -#include "chiptanusb_p.h" +#include "chiptanusb.h" #include <gwenhywfar/misc.h> #include <gwenhywfar/debug.h> @@ -29,6 +29,40 @@ #define PROGRAM_VERSION "1.0" + + +static void _extractReceivedGeneratorFields(GWEN_BUFFER *mbuf, int *ATC, char *TAN_String, uint32_t maxTanLen, + char *pCardnummber, char *pEndDate, char *pIssueDate); + + + + +/* + Building the apdu string + Die Eingabedaten werden wie folgt aufgebaut: + Laenge Inhalt Bedeutung + 4 00 00 00 00 Activation ID (fix) + 1 01 Processing Option Flag (POF) (fix) + 1 00 Controllbyte (fix) + 2 XX XX Laenge m des Datenblocks (MSB first, dez 35 = 00 23) + m XX XX Datenblock der Laenge m (Flickerdaten) + + diese sind als Daten Teil in ein Secoder-Kommando Nr 6 einzutragen also + 20 76 00 00 00 <Lc> <Lc> <Eingabedaten> 00(Le) 00(Le) + Oder Boxing + FF 91 06 00 00 <Lc> <Lc> <Eingabedaten> 00(Le) 00(Le) + + Quittung fuer die TanGenerierung + transmitted: + FF 91 07 00 00 00 06 00 00 00 00 00 00 00 00 + received: + 00 01 91 00 + Zurueckmeldung: + sw1 = 0x91 + sw2 = 0; +*/ + + /* Extract card Info Parameter: mbuf: Info received from card @@ -42,7 +76,7 @@ type of field must be char[7] */ -void ExtractReceivedGeneratorFields(GWEN_BUFFER *mbuf, int *ATC, char *TAN_String, uint32_t maxTanLen, +void _extractReceivedGeneratorFields(GWEN_BUFFER *mbuf, int *ATC, char *TAN_String, uint32_t maxTanLen, char *pCardnummber, char *pEndDate, char *pIssueDate) { @@ -136,71 +170,69 @@ cl = LC_Client_new("PinTanKarte", PROGRAM_VERSION);// client.c if (LC_Client_Init(cl)) { - DBG_ERROR(0, "ERROR: Could not init libchipcard"); + DBG_ERROR(LC_LOGDOMAIN, "Could not init libchipcard"); LC_Client_free(cl); return GWEN_ERROR_NOT_CONNECTED; } - - DBG_INFO(0, "Connecting to server."); + DBG_INFO(LC_LOGDOMAIN, "Connecting to server."); res = LC_Client_Start(cl); if (res != LC_Client_ResultOk) { return GWEN_ERROR_NOT_CONNECTED; } - DBG_INFO(0, "Connected."); + DBG_INFO(LC_LOGDOMAIN, "Connected."); - DBG_INFO(0, "Waiting for card..."); + DBG_INFO(LC_LOGDOMAIN, "Waiting for card..."); res = LC_Client_GetNextCard(cl, &card, 20); if (res != LC_Client_ResultOk) { - DBG_ERROR(0, "ERROR: GetNextCard."); + DBG_ERROR(LC_LOGDOMAIN, "GetNextCard."); return GWEN_ERROR_REMOVED; } - DBG_INFO(0, "Found a card."); + DBG_INFO(LC_LOGDOMAIN, "Found a card."); if (LC_ChiptanusbCard_ExtendCard(card)) { - DBG_ERROR(0, "ERROR: Could not extend card as CipTanUsb card."); + DBG_ERROR(LC_LOGDOMAIN, "Could not extend card as CipTanUsb card."); return GWEN_ERROR_INVALID; } - DBG_INFO(0, "Opening card."); + DBG_INFO(LC_LOGDOMAIN, "Opening card."); res = LC_Card_Open(card); if (res != LC_Client_ResultOk) { - DBG_ERROR(0, "ERROR: Error executing command CardOpen (%d).\n", res); + DBG_ERROR(LC_LOGDOMAIN, "Error executing command CardOpen (%d).\n", res); return GWEN_ERROR_OPEN; } - DBG_INFO(0, "Card is a CipTanUsb card as expected."); + DBG_INFO(LC_LOGDOMAIN, "Card is a ChipTanUsb card as expected."); mbuf = GWEN_Buffer_new(0, 256, 0, 1); res = LC_ChiptanusbCard_GenerateTan(card, HHDCommand, fullHHD_Len, mbuf); if (res != LC_Client_ResultOk) { - DBG_ERROR(0, "ERROR: Error Reading Tan from card.\n"); + DBG_ERROR(LC_LOGDOMAIN, "Error Reading Tan from card.\n"); GWEN_Buffer_free(mbuf); return GWEN_ERROR_READ; } - ExtractReceivedGeneratorFields(mbuf, pATC, pGeneratedTAN, maxTanLen, pCardnummber, pEndDate, pIssueDate); + _extractReceivedGeneratorFields(mbuf, pATC, pGeneratedTAN, maxTanLen, pCardnummber, pEndDate, pIssueDate); GWEN_Buffer_free(mbuf); - LC_Card_Close(card); LC_Client_ReleaseCard(cl, card); LC_Card_free(card); LC_Client_free(cl); - return (0); } + +CHIPCARD_EXPORT GWEN_PLUGIN *ct_chiptanusb_factory(GWEN_PLUGIN_MANAGER *pm, const char *modName, const char *fileName) { GWEN_PLUGIN *pl; - pl = GWEN_Plugin_new(pm, modName, fileName); - + pl=GWEN_Crypt_Token_Plugin_new(pm, GWEN_Crypt_Token_Device_Card, modName, fileName); if (pl==NULL) { DBG_ERROR(LC_LOGDOMAIN, "No plugin created"); return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb.h new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb.h --- old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb.h 2021-09-11 17:57:03.000000000 +0200 @@ -0,0 +1,38 @@ +/*************************************************************************** + begin : Sat Sep 11 2021 + copyright : (C) 2021 by Martin Preuss + email : [email protected] + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef CHIPCARD_CT_CHIPTANUSB_H +#define CHIPCARD_CT_CHIPTANUSB_H + + +#include <chipcard/card.h> + + + +/** Read information from Card + @param HHDCommand parameter for the card + @param fullHHD_Len size of HHDCommand field + @param pGeneratedTAN pointer to generated Tan + @param maxTanLen max Tan length in characters (size of receive Buffer must be maxTanLen + 1) + @param pATC pointer to ATC + @param pCardnummber pointer to card number (char[11] 10 + Terminator) + @param pEndDate pointer to end date of card yymm + (char[5] 4 + Terminator ) + @param pIssueDate pointer to IssueDate of card ddmmyy + (char[7]) 4 + Terminator +*/ +CHIPCARD_EXPORT + int GetTanfromUSB_Generator(unsigned char *HHDCommand, int fullHHD_Len, int *pATC, char *pGeneratedTAN, + uint32_t maxTanLen, char *pCardnummber, char *pEndDate, char *pIssueDate); + + + + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb_p.h new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb_p.h --- old/libchipcard-5.1.5rc2/src/ct/chiptanusb/chiptanusb_p.h 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/chiptanusb/chiptanusb_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -/*************************************************************************** - begin : Thu Jan 09 2020 - copyright : (C) 2020 by Ellebruch Herbert - email : - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - -#ifndef CHIPCARD_CT_CHIPTANUSB_P_H -#define CHIPCARD_CT_CHIPTANUSB_P_H - -// #include <gwenhywfar/ct_be.h> -// #include <gwenhywfar/ctplugin.h> -#include <chipcard/card.h> - -/* Extract card Info - Parameter: - mbuf: Info received from card - ATC: pointer to ATC - TAN_String: pointer to generated Tan - maxTanLen: max Tan length in characters (size of receive Buffer must be maxTanLen + 1) - pCardnummber: pointer to card number (char[11] 10 + Terminator) - pEndDate: pointer to end date of card yymm - type of field must be char[5] - pIssueDate: pointer to IssueDate of card ddmmyy - type of field must be char[7] -*/ - -static void ExtractReceivedGeneratorFields(GWEN_BUFFER *mbuf, int *ATC, char *TAN_String, uint32_t maxTanLen, - char *pCardnummber, char *pEndDate, char *pIssueDate); - - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/ddvcard/Makefile.am new/libchipcard-5.1.6/src/ct/ddvcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/ct/ddvcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/ddvcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards crypttokenplugindir=$(gwenhywfar_plugins)/ct crypttokenplugin_DATA=ddvcard.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/starcoscard/Makefile.am new/libchipcard-5.1.6/src/ct/starcoscard/Makefile.am --- old/libchipcard-5.1.5rc2/src/ct/starcoscard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/starcoscard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards crypttokenplugindir=$(gwenhywfar_plugins)/ct crypttokenplugin_DATA=starcoscard.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/zkacard/Makefile.am new/libchipcard-5.1.6/src/ct/zkacard/Makefile.am --- old/libchipcard-5.1.5rc2/src/ct/zkacard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/zkacard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../../ -I../../client -I../../cards crypttokenplugindir=$(gwenhywfar_plugins)/ct crypttokenplugin_DATA=zkacard.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/ct/zkacard/zkacard.c new/libchipcard-5.1.6/src/ct/zkacard/zkacard.c --- old/libchipcard-5.1.5rc2/src/ct/zkacard/zkacard.c 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/ct/zkacard/zkacard.c 2021-09-11 16:09:12.000000000 +0200 @@ -1898,22 +1898,22 @@ case 1: assert(hashAlgo==GWEN_Crypt_HashAlgoId_Rmd160); assert(binDataLen==20); - /* 20 byte Hashwert */ + /* 20 bytes hash value */ memcpy(hash, c, 20*sizeof(char)); - hash[21]='\0'; + hash[20]='\0'; hashLen=20; break; case 2: assert(binDataLen==32); if (hashAlgo==GWEN_Crypt_HashAlgoId_Rmd160) { - /*12bytes 00 20 bytes Hashwert*/ + /*12 bytes 00, 20 bytes hash value */ memcpy(hash, c+12, 20*sizeof(char)); - hash[21]='\0'; + hash[20]='\0'; hashLen=20; } else if (hashAlgo==GWEN_Crypt_HashAlgoId_Sha256) { memcpy(hash, c, 32*sizeof(char)); - hash[33]='\0'; + hash[32]='\0'; hashLen=32; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/Makefile.am new/libchipcard-5.1.6/src/lib/client/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -6,8 +6,7 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) - -INCLUDES = -I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS= -I$(libchipcard_symlinkdir) $(gwenhywfar_includes) lib_LTLIBRARIES=libchipcard.la noinst_PROGRAMS=libtest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/base/Makefile.am new/libchipcard-5.1.6/src/lib/client/base/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/base/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/base/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(pcsc_includes) $(gwenhywfar_includes) -I.. -I$(srcdir)/.. -I$(top_srcdir) @gwenhywfar_includes@ +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(pcsc_includes) $(gwenhywfar_includes) -I.. -I$(srcdir)/.. -I$(top_srcdir) @gwenhywfar_includes@ noinst_LTLIBRARIES=libbase.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/base/README.cards new/libchipcard-5.1.6/src/lib/client/base/README.cards --- old/libchipcard-5.1.5rc2/src/lib/client/base/README.cards 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/base/README.cards 2021-09-11 16:09:20.000000000 +0200 @@ -1 +1,4 @@ This folder contains the card XML files. + +The presence of this file on the target system is necessary for correct +operation of libchipcard (see https://bugs.debian.org/983764). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -4,14 +4,12 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I../client -I$(srcdir)/../ -I$(srcdir)/../client typefiles=hidata.xml - EXTRA_DIST=card.xml $(typefiles) -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I../client -I$(srcdir)/../ -I$(srcdir)/../client - noinst_LTLIBRARIES=libcards.la libcards_la_SOURCES=\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/chiptanusb/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/chiptanusb/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/chiptanusb/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/chiptanusb/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,11 +3,10 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I$(top_srcdir)/src/lib/sharedstuff EXTRA_DIST=app.xml card.xml -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I$(top_srcdir)/src/lib/sharedstuff - typefiles=types.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/chiptanusb/card.xml new/libchipcard-5.1.6/src/lib/client/cards/chiptanusb/card.xml --- old/libchipcard-5.1.5rc2/src/lib/client/cards/chiptanusb/card.xml 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/chiptanusb/card.xml 2021-09-11 16:09:12.000000000 +0200 @@ -8,6 +8,7 @@ <atrs> <atr>3b ef 00 ff 81 31 ?? 45 65 63 *</atr> <atr>3b ff 18 00 ff 81 31 ?? 45 65 63 *</atr> + <atr>3b ff 11 00 ff 81 31 ?? 95 80 f9 *</atr> </atrs> </cardinfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/ddvcard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/ddvcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/ddvcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/ddvcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,9 +3,7 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) - - -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=\ app.xml app-ddv0.xml app-ddv1.xml \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/egkcard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/egkcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/egkcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/egkcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,9 +3,7 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) - - -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app.xml card.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/geldkarte/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/geldkarte/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/geldkarte/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/geldkarte/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,11 +3,10 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app.xml card.xml types.xml -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ - typefiles=types.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/kvkcard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/kvkcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/kvkcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/kvkcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,13 +3,11 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app.xml card.xml -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ - - noinst_LTLIBRARIES=libcards-kvk.la noinst_HEADERS=\ kvkcard_p.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/memorycard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/memorycard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/memorycard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/memorycard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,9 +3,7 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) - - -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app.xml card.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/processorcard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/processorcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/processorcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/processorcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,9 +3,7 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) - - -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app.xml card.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/starcos/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/starcos/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/starcos/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/starcos/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,11 +3,10 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ EXTRA_DIST=app-hvb.xml app-vr.xml app.xml card.xml types.xml -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ - typefiles=types.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/cards/zkacard/Makefile.am new/libchipcard-5.1.6/src/lib/client/cards/zkacard/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/cards/zkacard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/cards/zkacard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -3,11 +3,10 @@ -DBUILDING_CHIPCARD AM_CFLAGS=$(visibility_cflags) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I$(top_srcdir)/src/lib/sharedstuff EXTRA_DIST=app.xml card.xml -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I../ -I$(top_srcdir)/src/lib/sharedstuff - typefiles=types.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/client/ct/Makefile.am new/libchipcard-5.1.6/src/lib/client/ct/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/client/ct/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/client/ct/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,5 +1,4 @@ - -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I.. -I$(srcdir)/.. +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I.. -I$(srcdir)/.. DEFS += \ -DBUILDING_CHIPCARD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/sharedstuff/Makefile.am new/libchipcard-5.1.6/src/lib/sharedstuff/Makefile.am --- old/libchipcard-5.1.5rc2/src/lib/sharedstuff/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/sharedstuff/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I.. -I../.. -I../../.. -I$(top_builddir) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) -I.. -I../.. -I../../.. -I$(top_builddir) typefiles=pininfo.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/lib/version.h new/libchipcard-5.1.6/src/lib/version.h --- old/libchipcard-5.1.5rc2/src/lib/version.h 2020-01-12 17:22:59.000000000 +0100 +++ new/libchipcard-5.1.6/src/lib/version.h 2021-09-17 17:43:28.000000000 +0200 @@ -31,11 +31,11 @@ #define CHIPCARD_VERSION_MAJOR 5 #define CHIPCARD_VERSION_MINOR 1 -#define CHIPCARD_VERSION_PATCHLEVEL 5 +#define CHIPCARD_VERSION_PATCHLEVEL 6 #define CHIPCARD_VERSION_BUILD 0 -#define CHIPCARD_VERSION_TAG "rc2" -#define CHIPCARD_VERSION_FULL_STRING "5.1.5.0rc2" -#define CHIPCARD_VERSION_STRING "5.1.5" +#define CHIPCARD_VERSION_TAG "stable" +#define CHIPCARD_VERSION_FULL_STRING "5.1.6.0stable" +#define CHIPCARD_VERSION_STRING "5.1.6" #endif /* CHIPCARD2_VERSION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/cardcommander/Makefile.am new/libchipcard-5.1.6/src/tools/cardcommander/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/cardcommander/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/cardcommander/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=cardcommander -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) cardcommander_SOURCES = cardcommander.cpp cardcommander_LDADD = ../../lib/client/libchipcard.la $(mingw_ldflags) @gwenhywfar_libs@ -lstdc++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/chipcard-tool/Makefile.am new/libchipcard-5.1.6/src/tools/chipcard-tool/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/chipcard-tool/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/chipcard-tool/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=chipcard-tool -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) noinst_HEADERS=global.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/geldkarte/Makefile.am new/libchipcard-5.1.6/src/tools/geldkarte/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/geldkarte/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/geldkarte/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=geldkarte -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) noinst_HEADERS=global.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/kvkcard/Makefile.am new/libchipcard-5.1.6/src/tools/kvkcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/kvkcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/kvkcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=kvkcard -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) EXTRA_DIST=README read.c rdvd.c rdpd.c psvd.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/memcard/Makefile.am new/libchipcard-5.1.6/src/tools/memcard/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/memcard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/memcard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=memcard -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) noinst_HEADERS=global.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/usbtan-test/Makefile.am new/libchipcard-5.1.6/src/tools/usbtan-test/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/usbtan-test/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/usbtan-test/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=usbtan-test -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) usbtan_test_SOURCES=\ main.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/usbtan-test/main.c new/libchipcard-5.1.6/src/tools/usbtan-test/main.c --- old/libchipcard-5.1.5rc2/src/tools/usbtan-test/main.c 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/usbtan-test/main.c 2021-09-11 16:09:12.000000000 +0200 @@ -21,6 +21,8 @@ #include <gwenhywfar/debug.h> #include <chipcard/client.h> +#include <ctype.h> + #define PROGRAM_VERSION "0.1" // **************************************************** routine from aqbanking start @@ -614,7 +616,7 @@ printf("ATC = %d\r\n", ATC); printf("Kartennummer = %s\r\n", Cardnummber); printf("EndeDatum = %s\r\n", EndDate); - printf("Ausgabedatum = = %s\r\n", IssueDate); + printf("Ausgabedatum = %s\r\n", IssueDate); rv = ((GetTanfromUSB_GeneratorFn)p)(HHDCommand, fullHHD_Len, &ATC, &GeneratedTAN[0], sizeof(GeneratedTAN) - 1, &Cardnummber[0], &EndDate[0], &IssueDate[0]); @@ -628,7 +630,7 @@ printf("ATC = %d\r\n", ATC); printf("Kartennummer = %s\r\n", Cardnummber); printf("EndeDatum = %s\r\n", EndDate); - printf("Ausgabedatum = = %s\r\n", IssueDate); + printf("Ausgabedatum = %s\r\n", IssueDate); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/src/tools/zkacard/Makefile.am new/libchipcard-5.1.6/src/tools/zkacard/Makefile.am --- old/libchipcard-5.1.5rc2/src/tools/zkacard/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/src/tools/zkacard/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,6 +1,6 @@ bin_PROGRAMS=zkacard-tool -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) noinst_HEADERS=global.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchipcard-5.1.5rc2/tutorials/Makefile.am new/libchipcard-5.1.6/tutorials/Makefile.am --- old/libchipcard-5.1.5rc2/tutorials/Makefile.am 2020-01-12 17:22:44.000000000 +0100 +++ new/libchipcard-5.1.6/tutorials/Makefile.am 2021-09-11 16:09:12.000000000 +0200 @@ -1,4 +1,4 @@ -INCLUDES=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) +AM_CPPFLAGS=-I$(libchipcard_symlinkdir) $(gwenhywfar_includes) EXTRA_DIST=README examplecard.xml tutorials.h
