New upstream version 1.4.36
This commit is contained in:
parent
651ecec10c
commit
3d895c8b7c
102
ChangeLog
102
ChangeLog
|
@ -1,4 +1,100 @@
|
|||
commit c0c84311c47fcae11ab34ec7b1f70f9518e37931 (HEAD -> master, zotac/master)
|
||||
commit 74642f87f9e1a937e807acd3a7d2ef600b8d151c (HEAD -> master, zotac/master, origin/master, origin/HEAD)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 30 11:14:49 2021 +0200
|
||||
|
||||
Release 1.4.36
|
||||
|
||||
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
|
||||
README.md | 9 +++++++++
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
commit abaca4dd1403c0962afb1f24ca80638f7f091d80
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 30 10:28:19 2021 +0200
|
||||
|
||||
Add SafeNet eToken 5110+ FIPS
|
||||
|
||||
readers/SafeNet_eToken_5110+_FIPS.txt | 97 +++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 99 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 3bb2c30d05d8f883e17f82a03a59a19c14df858d
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Aug 26 18:59:10 2021 +0200
|
||||
|
||||
Add SafeNet eToken 5300 C
|
||||
|
||||
readers/SafeNet_eToken_5300_C.txt | 97 +++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 99 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 36213a896116b3472868565cb8f55beacd2d5dfb
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Aug 26 11:49:30 2021 +0200
|
||||
|
||||
parse: fix check when bNumDataRatesSupported = 0
|
||||
|
||||
If bNumDataRatesSupported is zero then we should accept the returned
|
||||
size and do not expect 256 values (maximum value).
|
||||
|
||||
The fix removes the message:
|
||||
Got 50 data rates but was expecting 256
|
||||
when the token declares bNumDataRatesSupported = 0 and returns 50 value.
|
||||
|
||||
src/parse.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 5881da0965ba78eb2010b28c9d5d380e1672a307
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sat Aug 7 22:38:40 2021 +0200
|
||||
|
||||
Add REINER SCT tanJack USB
|
||||
|
||||
readers/ReinerSCT_tanJack_USB.txt | 53 +++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 55 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 48cec5bcdf12092c30110582baf0469c779a50f1
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Jul 30 18:53:34 2021 +0200
|
||||
|
||||
Code reformat: replace 4 spaces by 1 tab
|
||||
|
||||
Thanks to Godfrey Chung for the bug report
|
||||
https://github.com/LudovicRousseau/CCID/commit/2c600f55b351f524c27511e3303db690df41abca
|
||||
|
||||
src/ccid.c | 22 +++++++++----------
|
||||
src/ccid_serial.c | 18 ++++++++--------
|
||||
src/commands.c | 64 +++++++++++++++++++++++++++----------------------------
|
||||
src/debug.c | 24 ++++++++++-----------
|
||||
src/ifdhandler.c | 38 ++++++++++++++++-----------------
|
||||
src/parse.c | 36 +++++++++++++++----------------
|
||||
src/utils.c | 24 ++++++++++-----------
|
||||
7 files changed, 113 insertions(+), 113 deletions(-)
|
||||
|
||||
commit 38fc829a72cc42e53126e11a8bdb6c0081d7383f
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Jul 30 18:31:14 2021 +0200
|
||||
|
||||
Add jSolutions s.r.o. Multi SIM card reader 4/8
|
||||
|
||||
readers/jSolutions_Multi_SIM_card_reader_8.txt | 51 ++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 5 ++-
|
||||
2 files changed, 55 insertions(+), 1 deletion(-)
|
||||
|
||||
commit c9575ccbcb42118d9e639eaf097149993def2d1f
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue Jul 27 17:05:51 2021 +0200
|
||||
|
||||
Add Lenovo Lenovo Smartcard Wired Keyboard II
|
||||
|
||||
readers/Lenovo_Smartcard_Wired_Keyboard_II.txt | 58 ++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 60 insertions(+), 1 deletion(-)
|
||||
|
||||
commit c0c84311c47fcae11ab34ec7b1f70f9518e37931 (tag: 1.4.35, github/master)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Jul 25 16:00:35 2021 +0200
|
||||
|
||||
|
@ -55,7 +151,7 @@ Date: Fri Jul 9 21:36:46 2021 +0200
|
|||
src/ccid_usb.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit 6f7e48e4ef90bcba24351cd86bc4ec84f761a2ab (origin/master, origin/HEAD, github/master)
|
||||
commit 6f7e48e4ef90bcba24351cd86bc4ec84f761a2ab
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sat Jul 3 18:50:41 2021 +0200
|
||||
|
||||
|
@ -2060,7 +2156,7 @@ Date: Wed Apr 15 11:21:15 2020 +0200
|
|||
src/ccid_usb.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 4c8c809751211d35f4d417e1b086a554a79fd6e6 (usb)
|
||||
commit 4c8c809751211d35f4d417e1b086a554a79fd6e6 (zotac/usb, usb)
|
||||
Author: Stephan Guilloux (home) <stephan.guilloux@crisalid.com>
|
||||
Date: Tue Apr 14 13:19:45 2020 +0200
|
||||
|
||||
|
|
|
@ -117,6 +117,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|||
History:
|
||||
========
|
||||
|
||||
1.4.36 - 30 August 2021, Ludovic Rousseau
|
||||
- Add support of
|
||||
- Lenovo Lenovo Smartcard Wired Keyboard II
|
||||
- REINER SCT tanJack USB
|
||||
- SafeNet eToken 5110+ FIPS
|
||||
- SafeNet eToken 5300 C
|
||||
- jSolutions s.r.o. Multi SIM card reader 4/8
|
||||
- parse: fix check when bNumDataRatesSupported = 0
|
||||
|
||||
1.4.35 - 25 July 2021, Ludovic Rousseau
|
||||
- Add support of
|
||||
- ArkSigner Connect2Sign
|
||||
|
|
|
@ -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.35.
|
||||
# Generated by GNU Autoconf 2.69 for ccid 1.4.36.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
@ -587,8 +587,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='ccid'
|
||||
PACKAGE_TARNAME='ccid'
|
||||
PACKAGE_VERSION='1.4.35'
|
||||
PACKAGE_STRING='ccid 1.4.35'
|
||||
PACKAGE_VERSION='1.4.36'
|
||||
PACKAGE_STRING='ccid 1.4.36'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
@ -1377,7 +1377,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# 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.35 to adapt to many kinds of systems.
|
||||
\`configure' configures ccid 1.4.36 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -1448,7 +1448,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of ccid 1.4.35:";;
|
||||
short | recursive ) echo "Configuration of ccid 1.4.36:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -1595,7 +1595,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
ccid configure 1.4.35
|
||||
ccid configure 1.4.36
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF
|
|||
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.35, which was
|
||||
It was created by ccid $as_me 1.4.36, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
@ -2873,7 +2873,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='ccid'
|
||||
VERSION='1.4.35'
|
||||
VERSION='1.4.36'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
@ -14765,7 +14765,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# 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.35, which was
|
||||
This file was extended by ccid $as_me 1.4.36, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -14831,7 +14831,7 @@ _ACEOF
|
|||
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.35
|
||||
ccid config.status 1.4.36
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Require autoconf 2.61
|
||||
AC_PREREQ([2.69])
|
||||
|
||||
AC_INIT([ccid],[1.4.35])
|
||||
AC_INIT([ccid],[1.4.36])
|
||||
AC_CONFIG_SRCDIR(src/ifdhandler.c)
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip subdir-objects foreign)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# List of readers supported by the CCID driver
|
||||
# Generated: 2021-06-22
|
||||
# Generated: 2021-08-30
|
||||
#
|
||||
# DO NOT EDIT BY HAND
|
||||
|
||||
|
@ -559,6 +559,9 @@
|
|||
# IonIDe
|
||||
0x076B:0x3B01:IonIDe Smartcard Reader
|
||||
|
||||
# jSolutions s.r.o.
|
||||
0x04D8:0xEB61:jSolutions s.r.o. Multi SIM card reader 4/8
|
||||
|
||||
# KACST
|
||||
0x2A18:0x5000:KACST HSID Reader
|
||||
0x2A18:0x5001:KACST HSID Reader Single Storage
|
||||
|
@ -593,6 +596,7 @@
|
|||
# Lenovo
|
||||
0x17EF:0x6007:Lenovo Lenovo USB Smartcard Keyboard
|
||||
0x17EF:0x6055:Lenovo Lenovo USB Smartcard Keyboard
|
||||
0x17EF:0x6111:Lenovo Lenovo Smartcard Wired Keyboard II
|
||||
|
||||
# Liteon
|
||||
0x03F0:0x164A:Liteon HP SC Keyboard - Apollo (Liteon)
|
||||
|
@ -691,6 +695,7 @@
|
|||
# REINER SCT
|
||||
0x0C4B:0x0504:REINER SCT cyberJack go
|
||||
0x0C4B:0x0520:REINER SCT tanJack Bluetooth
|
||||
0x0C4B:0x0551:REINER SCT tanJack USB
|
||||
0x0C4B:0x0580:REINER SCT cyberJack one
|
||||
0x0C4B:0x9102:REINER SCT cyberJack RFID basis
|
||||
|
||||
|
@ -704,6 +709,8 @@
|
|||
0x0529:0x0602:SafeNet eToken 7300
|
||||
0x0529:0x0620:SafeNet eToken 5100
|
||||
0x08E6:0x34CC:SafeNet eToken 5300
|
||||
0x08E6:0x34CE:SafeNet eToken 5300 C
|
||||
0x08E6:0x34CF:SafeNet eToken 5110+ FIPS
|
||||
|
||||
# SafeTech
|
||||
0x24A2:0x0102:SafeTech SafeTouch
|
||||
|
|
|
@ -474,10 +474,13 @@ static int ccid_parse_interface_descriptor(libusb_device_handle *handle,
|
|||
bNumDataRatesSupported ? "" : " (will use whatever is returned)");
|
||||
{
|
||||
int n;
|
||||
int n_max;
|
||||
|
||||
if (0 == bNumDataRatesSupported)
|
||||
/* read up to the buffer size */
|
||||
bNumDataRatesSupported = sizeof(buffer) / sizeof(int);
|
||||
n_max = sizeof(buffer) / sizeof(int);
|
||||
else
|
||||
n_max = bNumDataRatesSupported;
|
||||
|
||||
/* See CCID 5.3.3 page 24 */
|
||||
n = libusb_control_transfer(handle,
|
||||
|
@ -486,7 +489,7 @@ static int ccid_parse_interface_descriptor(libusb_device_handle *handle,
|
|||
0x00, /* value */
|
||||
usb_interface_descriptor->bInterfaceNumber, /* interface */
|
||||
buffer,
|
||||
bNumDataRatesSupported * sizeof(int),
|
||||
n_max * sizeof(int),
|
||||
2 * 1000);
|
||||
|
||||
/* we got an error? */
|
||||
|
|
Loading…
Reference in New Issue