Hello community, here is the log from the commit of package pcsc-ccid for openSUSE:Factory checked in at 2013-04-22 14:15:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-ccid (Old) and /work/SRC/openSUSE:Factory/.pcsc-ccid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcsc-ccid", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-ccid/pcsc-ccid.changes 2013-01-17 09:54:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcsc-ccid.new/pcsc-ccid.changes 2013-04-22 14:15:41.000000000 +0200 @@ -1,0 +2,26 @@ +Sun Apr 21 16:02:52 UTC 2013 - [email protected] + +- Updated to version 1.4.10 + * Add support of + ACS APG8201 USB Reader with PID 0x8202 + GIS Ltd SmartMouse USB + Gemalto IDBridge K3000 + Identive CLOUD 2700 F Smart Card Reader + Identive CLOUD 2700 R Smart Card Reader + Identive CLOUD 4500 F Dual Interface Reader + Identive CLOUD 4510 F Contactless + SAM Reader + Identive CLOUD 4700 F Dual Interface Reader + Identive CLOUD 4710 F Contactless + SAM Reader + Inside Secure AT90SCR050 + Inside Secure AT90SCR100 + Inside Secure AT90SCR200 + SCR3310-NTTCom USB SmartCard Reader + SafeTech SafeTouch + SpringCard H512 Series + SpringCard H663 Series + SpringCard NFC'Roll + Yubico Yubikey NEO CCID + Yubico Yubikey NEO OTP+CCID + * Add support of time extension for Escape commands + +------------------------------------------------------------------- Old: ---- ccid-1.4.9.tar.bz2 ccid-1.4.9.tar.bz2.asc New: ---- ccid-1.4.10.tar.bz2 ccid-1.4.10.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-ccid.spec ++++++ --- /var/tmp/diff_new_pack.5eCjxe/_old 2013-04-22 14:15:49.000000000 +0200 +++ /var/tmp/diff_new_pack.5eCjxe/_new 2013-04-22 14:15:49.000000000 +0200 @@ -32,7 +32,7 @@ %if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.4.9 +Version: 1.4.10 Release: 0 Url: http://pcsclite.alioth.debian.org/ccid.html Summary: PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader ++++++ ccid-1.4.9.tar.bz2 -> ccid-1.4.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/ChangeLog new/ccid-1.4.10/ChangeLog --- old/ccid-1.4.9/ChangeLog 2012-10-07 13:46:15.000000000 +0200 +++ new/ccid-1.4.10/ChangeLog 2013-01-18 19:46:09.000000000 +0100 @@ -1,3 +1,30 @@ +2013-01-16 Ludovic Rousseau + + * [r6507] README, configure.ac: Release 1.4.9 + +2012-11-13 Ludovic Rousseau + + * [r6482] readers/ReinerSCT_cyberJack_go.txt, + readers/supported_readers.txt: Add REINER SCT cyberJack go + * [r6481] readers/supported_readers.txt: Move ATMEL VaultIC460 in + unsupported list See revision 6479 + +2012-10-31 Ludovic Rousseau + + * [r6478] src/ifdhandler.c: IFDHSetProtocolParameters(): display + the timeout + + If the reader has CCID_CLASS_AUTO_PPS_PROP then the negociations + are done by the reader itself and the default timeout + DEFAULT_COM_READ_TIMEOUT is used. + +2012-10-12 Ludovic Rousseau + + * [r6475] readers/Rutoken_PINPad_in.txt, + readers/supported_readers.txt: Add Aktiv Rutoken PINPad In + * [r6474] readers/Rutoken_PINPad_ex.txt, + readers/supported_readers.txt: Add Aktiv Rutoken PINPad Ex + 2012-10-07 Ludovic Rousseau * [r6471] README: Fix typo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/README new/ccid-1.4.10/README --- old/ccid-1.4.9/README 2013-01-16 16:14:20.000000000 +0100 +++ new/ccid-1.4.10/README 2013-04-16 14:46:02.000000000 +0200 @@ -118,6 +118,30 @@ History: ======== +1.4.10 - 16 April 2013, Ludovic Rousseau + - Add support of + . ACS APG8201 USB Reader with PID 0x8202 + . GIS Ltd SmartMouse USB + . Gemalto IDBridge K3000 + . Identive CLOUD 2700 F Smart Card Reader + . Identive CLOUD 2700 R Smart Card Reader + . Identive CLOUD 4500 F Dual Interface Reader + . Identive CLOUD 4510 F Contactless + SAM Reader + . Identive CLOUD 4700 F Dual Interface Reader + . Identive CLOUD 4710 F Contactless + SAM Reader + . Inside Secure AT90SCR050 + . Inside Secure AT90SCR100 + . Inside Secure AT90SCR200 + . SCR3310-NTTCom USB SmartCard Reader + . SafeTech SafeTouch + . SpringCard H512 Series + . SpringCard H663 Series + . SpringCard NFC'Roll + . Yubico Yubikey NEO CCID + . Yubico Yubikey NEO OTP+CCID + - Add support of time extension for Escape commands + + 1.4.9 - 16 January 2013, Ludovic Rousseau - Add support of . Aktiv Rutoken PINPad In @@ -779,6 +803,6 @@ - First public release -$Id: README 6507 2013-01-16 15:11:53Z rousseau $ +$Id: README 6609 2013-04-16 12:43:58Z rousseau $ vim:ts=20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/configure new/ccid-1.4.10/configure --- old/ccid-1.4.9/configure 2013-01-16 16:38:45.000000000 +0100 +++ new/ccid-1.4.10/configure 2013-04-16 14:46:09.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ccid 1.4.9. +# Generated by GNU Autoconf 2.69 for ccid 1.4.10. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='ccid' PACKAGE_TARNAME='ccid' -PACKAGE_VERSION='1.4.9' -PACKAGE_STRING='ccid 1.4.9' +PACKAGE_VERSION='1.4.10' +PACKAGE_STRING='ccid 1.4.10' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1361,7 +1361,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ccid 1.4.9 to adapt to many kinds of systems. +\`configure' configures ccid 1.4.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1431,7 +1431,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ccid 1.4.9:";; + short | recursive ) echo "Configuration of ccid 1.4.10:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ccid configure 1.4.9 +ccid configure 1.4.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1980,7 +1980,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ccid $as_me 1.4.9, which was +It was created by ccid $as_me 1.4.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2796,7 +2796,7 @@ # Define the identity of the package. PACKAGE='ccid' - VERSION='1.4.9' + VERSION='1.4.10' cat >>confdefs.h <<_ACEOF @@ -13980,7 +13980,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ccid $as_me 1.4.9, which was +This file was extended by ccid $as_me 1.4.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14046,7 +14046,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ccid config.status 1.4.9 +ccid config.status 1.4.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/configure.ac new/ccid-1.4.10/configure.ac --- old/ccid-1.4.9/configure.ac 2013-01-16 16:14:20.000000000 +0100 +++ new/ccid-1.4.10/configure.ac 2013-04-16 14:46:02.000000000 +0200 @@ -1,12 +1,12 @@ # Process this file with autoconf to produce a configure script. # You may need to use autoconf 2.56 or newer -# $Id: configure.ac 6507 2013-01-16 15:11:53Z rousseau $ +# $Id: configure.ac 6609 2013-04-16 12:43:58Z rousseau $ # Require autoconf 2.61 AC_PREREQ([2.69]) -AC_INIT([ccid],[1.4.9]) +AC_INIT([ccid],[1.4.10]) AC_CONFIG_SRCDIR(src/ifdhandler.c) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/examples/PCSCv2part10.c new/ccid-1.4.10/examples/PCSCv2part10.c --- old/ccid-1.4.9/examples/PCSCv2part10.c 2012-08-12 16:33:49.000000000 +0200 +++ new/ccid-1.4.10/examples/PCSCv2part10.c 2013-03-06 15:23:34.000000000 +0100 @@ -18,7 +18,7 @@ */ /* - * $Id: PCSCv2part10.c 6428 2012-08-10 13:16:46Z rousseau $ + * $Id: PCSCv2part10.c 6559 2013-03-06 14:18:24Z rousseau $ */ #include <stdio.h> @@ -118,6 +118,8 @@ rv= SCardControl(hCard, properties_in_tlv_ioctl, NULL, 0, buffer, sizeof buffer, &length); + if (rv != SCARD_S_SUCCESS) + return -1; return PCSCv2Part10_find_TLV_property_by_tag_from_buffer(buffer, length, property, value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/examples/scardcontrol.c new/ccid-1.4.10/examples/scardcontrol.c --- old/ccid-1.4.9/examples/scardcontrol.c 2012-08-12 16:33:49.000000000 +0200 +++ new/ccid-1.4.10/examples/scardcontrol.c 2013-03-16 14:52:33.000000000 +0100 @@ -18,7 +18,7 @@ */ /* - * $Id: scardcontrol.c 6406 2012-08-07 14:56:20Z rousseau $ + * $Id: scardcontrol.c 6566 2013-03-12 14:00:37Z rousseau $ */ #include <stdio.h> @@ -750,9 +750,11 @@ { /* read the fake digits */ char in[40]; /* 4 digits + \n + \0 */ + char *ret; - (void)fgets(in, sizeof(in), stdin); - printf("keyboard sent: %s", in); + ret = fgets(in, sizeof(in), stdin); + if (ret) + printf("keyboard sent: %s", in); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/readers/supported_readers.txt new/ccid-1.4.10/readers/supported_readers.txt --- old/ccid-1.4.9/readers/supported_readers.txt 2012-11-28 18:24:45.000000000 +0100 +++ new/ccid-1.4.10/readers/supported_readers.txt 2013-04-16 14:37:17.000000000 +0200 @@ -1,6 +1,6 @@ # # List of readers supported by the CCID driver -# Generated: 2012-11-13 +# Generated: 2013-04-16 # # DO NOT EDIT BY HAND @@ -62,6 +62,8 @@ 0x08E6:0x34C3:Gemalto EZIO CB+ 0x08E6:0x4433:Gemalto Gemplus USB SmartCard Reader 433-Swap 0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader +0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader +0x08E6:0x5504:Gemalto Prox SU USB PC LinkReader 0x08E6:0x5504:Gemalto Prox SU USB PC LinkReader 0x08E6:0x8000:Gemalto Smart Enterprise Guardian Secure USB Device @@ -118,6 +120,7 @@ # ACS 0x072F:0x1204:ACS ACR101 ICC Reader 0x072F:0x8201:ACS APG8201 PINhandy 1 +0x072F:0x8202:ACS APG8201 USB Reader 0x072F:0x90CC:ACS ACR122U 0x072F:0x90CC:ACS ACR100 0x072F:0x90CC:ACS ACR38 plugin @@ -180,6 +183,7 @@ 0x0A5C:0x5800:Broadcom Corp 5880 0x0A5C:0x5802:Broadcom Corp 5880 0x0A5C:0x5802:Broadcom Corp 5880 +0x0A5C:0x5802:Broadcom Corp 5880 # C3PO 0x0783:0x0007:C3PO TLTC2USB @@ -227,6 +231,7 @@ 0x08E6:0x4042:Gemalto SA .NET Dual 0x08E6:0x5743:Gemalto Hybrid Smartcard Reader 0x08E6:0x8108:Gemalto Smart Enterprise Guardian Secure USB Device +0x08E6:0x8141:Gemalto IDBridge K3000 # Gemplus 0x08E6:0x3479:Gemplus GemCore POS Pro Smart Card Reader @@ -241,6 +246,9 @@ 0x1059:0x000C:Giesecke & Devrient GmbH Star Sign Card Token 350 (ICCD) 0x1059:0x000D:Giesecke & Devrient GmbH Star Sign Card Token 550 (ICCD) +# GIS Ltd +0x0F1A:0x0002:GIS Ltd SmartMouse USB + # GoldKey Security 0x19C8:0x0012:GoldKey Security PIV Token @@ -254,10 +262,25 @@ 0x0B81:0x0200:id3 Semiconductors CL1356T5 0x0B81:0x0220:id3 Semiconductors CL1356A_HID +# Identive +0x04E6:0x5710:Identive CLOUD 2700 F Smart Card Reader +0x04E6:0x5720:Identive Identive CLOUD 4500 F Dual Interface Reader +0x04E6:0x5720:Identive Identive CLOUD 4500 F Dual Interface Reader +0x04E6:0x5720:Identive Identive CLOUD 4700 F Dual Interface Reader +0x04E6:0x5720:Identive Identive CLOUD 4700 F Dual Interface Reader +0x04E6:0x5721:Identive Identive CLOUD 4510 F Contactless + SAM Reader +0x04E6:0x5721:Identive Identive CLOUD 4510 F Contactless + SAM Reader +0x04E6:0x5721:Identive Identive CLOUD 4710 F Contactless + SAM Reader +0x04E6:0x5721:Identive Identive CLOUD 4710 F Contactless + SAM Reader +0x04E6:0x5810:Identive CLOUD 2700 R Smart Card Reader + # Inside Secure 0x2406:0x6300:Inside Secure VaultIC 420 Smart Object 0x2406:0x6301:Inside Secure VaultIC 440 Smart Object 0x2406:0x6302:Inside Secure VaultIC 460 Smart Object +0x2406:0x6403:Inside Secure AT90SCR100 +0x2406:0x6404:Inside Secure AT90SCR050 +0x2406:0x6407:Inside Secure AT90SCR200 # KEBTechnology 0x04CC:0x5072:KEBTechnology KONA USB SmartCard @@ -277,6 +300,10 @@ # Macally 0x08AE:0x0BDF:Macally NFC CCID eNetPad +# Morpho +0x079B:0x0026:Morpho MSO350/MSO351 Fingerprint Sensor & SmartCard Reader +0x079B:0x0052:Morpho MSO1350 Fingerprint Sensor & SmartCard Reader + # MSI 0x0BDA:0x0161:MSI StarReader SMART @@ -327,6 +354,9 @@ 0x0C4B:0x0504:REINER SCT cyberJack go 0x0C4B:0x9102:REINER SCT cyberJack RFID basis +# SafeTech +0x24A2:0x0102:SafeTech SafeTouch + # SchlumbergerSema 0x0973:0x0003:SchlumbergerSema SchlumbergerSema Cyberflex Access @@ -359,6 +389,9 @@ 0x1C34:0x7136:SpringCard EasyFinger Standard 0x1C34:0x7138:SpringCard EasyFinger Ultimate 0x1C34:0x7141:SpringCard Prox'N'Roll +0x1C34:0x8141:SpringCard NFC'Roll +0x1C34:0x91B1:SpringCard H663 Series +0x1C34:0xA1A1:SpringCard H512 Series # SYNNIX 0x1206:0x2105:SYNNIX STD200 @@ -401,6 +434,10 @@ # XIRING 0x0F14:0x0011:XIRING XI-SIGN USB V2 +# Yubico +0x1050:0x0111:Yubico Yubikey NEO OTP+CCID +0x1050:0x0112:Yubico Yubikey NEO CCID + ########################## # section: unsupported ########################## @@ -477,6 +514,16 @@ #0x04E6:0x5410:SCM Microsystems Inc. SCR35xx v2.0 USB SC Reader (SCR3500.txt) #0x04E6:0x5410:SCM Microsystems Inc. SCR 355 (SCR355.txt) +#0x04E6:0x5720:Identive Identive CLOUD 4500 F Dual Interface Reader (Identive_CLOUD_4500_F.txt) +#0x04E6:0x5720:Identive Identive CLOUD 4500 F Dual Interface Reader (Identive_CLOUD_4500_F.txt_i1) +#0x04E6:0x5720:Identive Identive CLOUD 4700 F Dual Interface Reader (Identive_CLOUD_4700_F.txt) +#0x04E6:0x5720:Identive Identive CLOUD 4700 F Dual Interface Reader (Identive_CLOUD_4700_F.txt_i1) + +#0x04E6:0x5721:Identive Identive CLOUD 4510 F Contactless + SAM Reader (Identive_CLOUD_4510_F.txt) +#0x04E6:0x5721:Identive Identive CLOUD 4510 F Contactless + SAM Reader (Identive_CLOUD_4510_F.txt_i1) +#0x04E6:0x5721:Identive Identive CLOUD 4710 F Contactless + SAM Reader (Identive_CLOUD_4710_F.txt) +#0x04E6:0x5721:Identive Identive CLOUD 4710 F Contactless + SAM Reader (Identive_CLOUD_4710_F.txt_i1) + #0x058F:0x9520:Alcor Micro AU9520 (AU9520.txt) #0x058F:0x9520:Akasa AK-CR-03 (Akasa_AK-CR-03.txt) #0x058F:0x9520:Alcor Micro SCR001 (Alcor_SCR001.txt) @@ -499,8 +546,15 @@ #0x08E6:0x3478:Gemalto USB GemPCPinpad SmartCard Reader (GemPCPinpad.txt) #0x08E6:0x3478:Gemalto USB GemPCPinpad SmartCard Reader (GemPCPinpadv2.txt) +#0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader (GemProxDU.txt) +#0x08E6:0x5503:Gemalto Prox Dual USB PC LinkReader (GemProxDU.txt_i1) + +#0x08E6:0x5504:Gemalto Prox SU USB PC LinkReader (GemProxSU.txt) +#0x08E6:0x5504:Gemalto Prox SU USB PC LinkReader (GemProxSU.txt_i1) + #0x0A5C:0x5802:Broadcom Corp 5880 (Broadcom_5880v3.txt) #0x0A5C:0x5802:Broadcom Corp 5880 (Broadcom_5880v4.txt) +#0x0A5C:0x5802:Broadcom Corp 5880 (Broadcom_5880v4.txt_i1) #0x0B81:0x0200:id3 Semiconductors CL1356T (id3_CL1356T.txt) #0x0B81:0x0200:id3 Semiconductors CL1356T5 (id3_CL1356T5.txt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/92_pcscd_ccid.rules new/ccid-1.4.10/src/92_pcscd_ccid.rules --- old/ccid-1.4.9/src/92_pcscd_ccid.rules 2012-06-08 16:17:11.000000000 +0200 +++ new/ccid-1.4.10/src/92_pcscd_ccid.rules 2013-04-16 14:37:17.000000000 +0200 @@ -1,7 +1,7 @@ # udev rules to set the access rights of CCID smart card readers # so they can be used by pcscd -# $Id: 92_pcscd_ccid.rules 6275 2012-04-17 13:42:42Z rousseau $ +# $Id: 92_pcscd_ccid.rules 6587 2013-04-05 16:31:55Z rousseau $ # Gemplus PCMCIA Card #SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug" @@ -29,7 +29,9 @@ ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", GROUP="pcscd" # MySmartPad.txt ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", GROUP="pcscd" -# SCR331-DI-NTTCom.txt +# SCR3310-NTTCom USB SmartCard Reader +ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", GROUP="pcscd" +# SCR331-DI USB Smart Card Reader ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", GROUP="pcscd" # SCR331-DI.txt ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", GROUP="pcscd" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/Info.plist.src new/ccid-1.4.10/src/Info.plist.src --- old/ccid-1.4.9/src/Info.plist.src 2010-12-03 15:44:15.000000000 +0100 +++ new/ccid-1.4.10/src/Info.plist.src 2013-01-27 11:53:40.000000000 +0100 @@ -5,7 +5,7 @@ <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> - <string>MAGIC_BUNDLE</string> + <string>MAGIC_TARGET</string> <key>CFBundleIdentifier</key> <string>org.debian.alioth.pcsclite.smartcardccid</string> <key>CFBundleInfoDictionaryVersion</key> @@ -92,9 +92,6 @@ Default value: 0 --> - <key>CFBundleExecutable</key> - <string>MAGIC_TARGET</string> - <key>ifdManufacturerString</key> <string>Ludovic Rousseau ([email protected])</string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/Makefile.am new/ccid-1.4.10/src/Makefile.am --- old/ccid-1.4.9/src/Makefile.am 2011-08-24 11:31:53.000000000 +0200 +++ new/ccid-1.4.10/src/Makefile.am 2013-01-27 12:21:25.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 5909 2011-08-24 09:30:55Z rousseau $ +# $Id: Makefile.am 6518 2013-01-27 11:21:23Z rousseau $ CCID_BUNDLE = $(bundle) CCID_LIB = libccid.$(DYN_LIB_EXT) @@ -78,7 +78,7 @@ INSTALL_UDEV_RULE_FILE=@/bin/echo -e "\n\33[01;31m***************\n" ; echo "copy the src/92_pcscd_ccid.rules file in udev directory (/etc/udev/rules.d/)" ; /bin/echo -e "\n***************\n\33[0m" Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt - $(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) --bundle=$(CCID_BUNDLE) $(NOCLASS) > Info.plist + $(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) $(NOCLASS) > Info.plist DISTCLEANFILES = tokenparser.c Info.plist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/Makefile.in new/ccid-1.4.10/src/Makefile.in --- old/ccid-1.4.9/src/Makefile.in 2013-01-16 16:38:46.000000000 +0100 +++ new/ccid-1.4.10/src/Makefile.in 2013-04-16 14:46:09.000000000 +0200 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am 5909 2011-08-24 09:30:55Z rousseau $ +# $Id: Makefile.am 6518 2013-01-27 11:21:23Z rousseau $ VPATH = @srcdir@ @@ -1062,7 +1062,7 @@ install: $(LIBS_TO_INSTALL) Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt - $(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) --bundle=$(CCID_BUNDLE) $(NOCLASS) > Info.plist + $(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) $(NOCLASS) > Info.plist install_ccid: libccid.la Info.plist $(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/commands.c new/ccid-1.4.10/src/commands.c --- old/ccid-1.4.9/src/commands.c 2012-06-08 16:17:11.000000000 +0200 +++ new/ccid-1.4.10/src/commands.c 2013-03-16 14:52:33.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - * $Id: commands.c 6311 2012-05-26 15:33:07Z rousseau $ + * $Id: commands.c 6570 2013-03-14 09:12:47Z rousseau $ */ #include <string.h> @@ -855,6 +855,8 @@ goto end; } +time_request: + length_out = 10 + *RxLength; res = ReadPort(reader_index, &length_out, cmd_out); /* replay the command if NAK @@ -885,6 +887,12 @@ goto end; } + if (cmd_out[STATUS_OFFSET] & CCID_TIME_EXTENSION) + { + DEBUG_COMM2("Time extension requested: 0x%02X", cmd_out[ERROR_OFFSET]); + goto time_request; + } + if (cmd_out[STATUS_OFFSET] & CCID_COMMAND_FAILED) { ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */ @@ -1701,14 +1709,15 @@ unsigned int proc_len, int is_rcv) { RESPONSECODE return_value; - unsigned int remain_len; - unsigned char tmp_buf[512]; unsigned int ret_len; DEBUG_COMM2("Enter, is_rcv = %d", is_rcv); if (is_rcv == 1) { /* Receiving mode */ + unsigned int remain_len; + unsigned char tmp_buf[512]; + if (*in_len > 0) { /* There are still available data in our buffer */ if (*in_len >= proc_len) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/create_Info_plist.pl new/ccid-1.4.10/src/create_Info_plist.pl --- old/ccid-1.4.9/src/create_Info_plist.pl 2011-10-30 14:01:56.000000000 +0100 +++ new/ccid-1.4.10/src/create_Info_plist.pl 2013-03-06 15:23:34.000000000 +0100 @@ -28,7 +28,6 @@ my ($manuf, $product, $name); my $target = "libccid.so"; my $version = "1.0.0"; -my $bundle = "ifd-ccid.bundle"; my $class = "<key>CFBundleName</key> <string>CCIDCLASSDRIVER</string>"; my $noclass = 0; @@ -36,15 +35,13 @@ GetOptions( "target=s" => \$target, "version=s" => \$version, - "bundle=s" => \$bundle, "no-class" => \$noclass); if ($#ARGV < 1) { print "usage: $0 supported_readers.txt Info.plist --target=$target - --version=$version - --bundle=$bundle\n"; + --version=$version\n"; exit; } @@ -99,12 +96,6 @@ print; next; } - if (m/MAGIC_BUNDLE/) - { - s/MAGIC_BUNDLE/$bundle/; - print; - next; - } if (m/MAGIC_CLASS/) { next if ($noclass); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/ifdhandler.c new/ccid-1.4.10/src/ifdhandler.c --- old/ccid-1.4.9/src/ifdhandler.c 2012-11-28 18:24:45.000000000 +0100 +++ new/ccid-1.4.10/src/ifdhandler.c 2013-03-16 14:52:33.000000000 +0100 @@ -17,7 +17,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: ifdhandler.c 6478 2012-10-31 15:20:20Z rousseau $ */ +/* $Id: ifdhandler.c 6563 2013-03-06 14:27:02Z rousseau $ */ #include <stdio.h> #include <string.h> @@ -1925,7 +1925,6 @@ unsigned int card_baudrate; unsigned int default_baudrate; double f, d; - int i; /* if TA1 not present */ if (! atr->ib[0][ATR_INTERFACE_BYTE_TA].present) @@ -1963,6 +1962,8 @@ if (SCARD_PROTOCOL_T1 == Protocol) { + int i; + /* TBi (i>2) present? BWI/CWI */ for (i=2; i<ATR_MAX_PROTOCOLS; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/openct/proto-t1.c new/ccid-1.4.10/src/openct/proto-t1.c --- old/ccid-1.4.9/src/openct/proto-t1.c 2012-06-08 16:17:11.000000000 +0200 +++ new/ccid-1.4.10/src/openct/proto-t1.c 2013-03-16 14:52:33.000000000 +0100 @@ -158,7 +158,7 @@ { ct_buf_t sbuf, rbuf, tbuf; unsigned char sdata[T1_BUFFER_SIZE], sblk[5]; - unsigned int slen, retries, resyncs, sent_length = 0; + unsigned int slen, retries, resyncs; size_t last_send = 0; if (snd_len == 0) @@ -331,7 +331,6 @@ * block successfully */ if (t1_seq(pcb) != t1->ns) { ct_buf_get(&sbuf, NULL, last_send); - sent_length += last_send; last_send = 0; t1->ns ^= 1; } @@ -393,7 +392,6 @@ DEBUG_COMM("S-Block answer received"); /* ISO 7816-3 Rule 6.3 */ t1->state = SENDING; - sent_length = 0; last_send = 0; resyncs = 3; retries = t1->retries; @@ -647,7 +645,7 @@ static int t1_xcv(t1_state_t * t1, unsigned char *block, size_t slen, size_t rmax) { - int n, m; + int n; _ccid_descriptor *ccid_desc ; int oldReadTimeout; unsigned int rmax_int; @@ -721,6 +719,8 @@ if (n >= 0) { + int m; + m = block[2] + 3 + t1->rc_bytes; if (m < n) n = m; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ccid-1.4.9/src/parse.c new/ccid-1.4.10/src/parse.c --- old/ccid-1.4.9/src/parse.c 2011-08-21 15:03:31.000000000 +0200 +++ new/ccid-1.4.10/src/parse.c 2013-03-06 15:23:34.000000000 +0100 @@ -18,7 +18,7 @@ */ /* - * $Id: parse.c 5895 2011-08-20 18:44:04Z rousseau $ + * $Id: parse.c 6562 2013-03-06 14:23:22Z rousseau $ */ #include <stdio.h> @@ -96,7 +96,9 @@ struct libusb_config_descriptor *config_desc; struct libusb_device_handle *handle; const struct libusb_interface *usb_interface = NULL; +#ifndef __APPLE__ int interface; +#endif int num = 0; r = libusb_open(dev, &handle); @@ -189,8 +191,8 @@ } #endif - interface = usb_interface->altsetting->bInterfaceNumber; #ifndef __APPLE__ + interface = usb_interface->altsetting->bInterfaceNumber; r = libusb_claim_interface(handle, interface); if (r < 0) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
