1.5.0-1
This commit is contained in:
Jakub Jelen
parent
ee99a9bee4
commit
6aa5c02519
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,3 +19,4 @@
|
||||
/ccid-1.4.34.tar.bz2.asc
|
||||
/ccid-1.4.35.tar.bz2.asc
|
||||
/ccid-1.4.36.tar.bz2.asc
|
||||
/ccid-1.5.0.tar.bz2.asc
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
From b48e1e697010431b7f03d4ecfe917ceee95e2c64 Mon Sep 17 00:00:00 2001
|
||||
From: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue, 7 Sep 2021 14:06:46 +0200
|
||||
Subject: [PATCH] Fix SafeNet eToken 5110 SC issue
|
||||
|
||||
Some SafeNet eToken 5100 (but not all) have issues when IFSD is negotiated.
|
||||
For some APDU the communication stops and the token returns 0 bytes.
|
||||
|
||||
It is the case with the SafeNet eToken 5110 SC with
|
||||
ATR: 3B D5 18 00 81 31 3A 7D 80 73 C8 21 10 30
|
||||
and PC/SC name "SafeNet eToken 5100 [eToken 5110 SC]"
|
||||
|
||||
Another SafeNet eToken 5100 with
|
||||
ATR: 3B D5 18 00 81 31 FE 7D 80 73 C8 21 10 F4
|
||||
and PC/SC name "SafeNet eToken 5100 [Main Interface]"
|
||||
does NOT have problems with the the IFSD negotiation.
|
||||
|
||||
|
||||
This fixes Debian bug #993647
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=993647
|
||||
---
|
||||
src/ccid.c | 7 +++++++
|
||||
src/ccid.h | 1 +
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/ccid.c b/src/ccid.c
|
||||
index efef240..0d7ba54 100644
|
||||
--- a/src/ccid.c
|
||||
+++ b/src/ccid.c
|
||||
@@ -576,6 +576,13 @@ int ccid_open_hack_post(unsigned int reader_index)
|
||||
* have one */
|
||||
ccid_descriptor->bPINSupport = 0;
|
||||
break;
|
||||
+
|
||||
+ case SAFENET_ETOKEN_5100:
|
||||
+ /* the old SafeNet eToken 5110 SC (firmware 0.12) does not
|
||||
+ * like IFSD negotiation. So disable it. */
|
||||
+ if (0x0012 == ccid_descriptor->IFD_bcdDevice)
|
||||
+ ccid_descriptor->dwFeatures |= CCID_CLASS_AUTO_IFSD;
|
||||
+ break;
|
||||
}
|
||||
|
||||
/* Gemalto readers may report additional information */
|
||||
diff --git a/src/ccid.h b/src/ccid.h
|
||||
index b28f0c1..00ce07a 100644
|
||||
--- a/src/ccid.h
|
||||
+++ b/src/ccid.h
|
||||
@@ -239,6 +239,7 @@ typedef struct
|
||||
#define IDENTIV_uTrust3701F 0x04E65791
|
||||
#define IDENTIV_uTrust4701F 0x04E65724
|
||||
#define BIT4ID_MINILECTOR 0x25DD3111
|
||||
+#define SAFENET_ETOKEN_5100 0x05290620
|
||||
|
||||
#define VENDOR_GEMALTO 0x08E6
|
||||
#define GET_VENDOR(readerID) ((readerID >> 16) & 0xFFFF)
|
||||
--
|
||||
GitLab
|
||||
|
||||
From 26ad96076523472e9d0d383d014e7b1ad241fd5b Mon Sep 17 00:00:00 2001
|
||||
From: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed, 8 Sep 2021 11:28:48 +0200
|
||||
Subject: [PATCH] Fix SafeNet eToken 5110 SC issue (firmware 0.13)
|
||||
|
||||
The SafeNet eToken 5110 SC with firmware 0.13 has the same problem as
|
||||
the token with firmware 0.12.
|
||||
We use the same oslution to fix the problem.
|
||||
|
||||
Thanks again to Vladimir K for the bug report.
|
||||
---
|
||||
src/ccid.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/ccid.c b/src/ccid.c
|
||||
index 0d7ba54..21a2fe8 100644
|
||||
--- a/src/ccid.c
|
||||
+++ b/src/ccid.c
|
||||
@@ -578,9 +578,10 @@ int ccid_open_hack_post(unsigned int reader_index)
|
||||
break;
|
||||
|
||||
case SAFENET_ETOKEN_5100:
|
||||
- /* the old SafeNet eToken 5110 SC (firmware 0.12) does not
|
||||
- * like IFSD negotiation. So disable it. */
|
||||
- if (0x0012 == ccid_descriptor->IFD_bcdDevice)
|
||||
+ /* the old SafeNet eToken 5110 SC (firmware 0.12 & 0.13)
|
||||
+ * does not like IFSD negotiation. So disable it. */
|
||||
+ if ((0x0012 == ccid_descriptor->IFD_bcdDevice)
|
||||
+ || (0x0013 == ccid_descriptor->IFD_bcdDevice))
|
||||
ccid_descriptor->dwFeatures |= CCID_CLASS_AUTO_IFSD;
|
||||
break;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
%global pcsc_lite_ver 1.8.9
|
||||
|
||||
Name: pcsc-lite-ccid
|
||||
Version: 1.4.36
|
||||
Release: 3%{?dist}
|
||||
Version: 1.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Generic USB CCID smart card reader driver
|
||||
|
||||
License: LGPLv2+
|
||||
@ -13,7 +13,6 @@ Source1: https://ccid.apdu.fr/files/ccid-%{version}.tar.bz2.asc
|
||||
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
|
||||
Patch0: ccid-1.4.26-omnikey-3121.patch
|
||||
Patch1: ccid-1.4.34-maxreaders.patch
|
||||
Patch2: ccid-1.4.36-etokent.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-interpreter
|
||||
@ -41,7 +40,6 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%setup -q -n ccid-%{version}
|
||||
%patch0 -p1 -b .omnikey
|
||||
%patch1 -p0 -b .maxreaders
|
||||
%patch2 -p1 -b .etoken
|
||||
|
||||
%build
|
||||
%configure --enable-twinserial
|
||||
@ -69,6 +67,9 @@ cp -p src/openct/LICENSE LICENSE.openct
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 28 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.0-1
|
||||
- New upstream release (#2047569)
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.36-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (ccid-1.4.36.tar.bz2) = e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
|
||||
SHA512 (ccid-1.4.36.tar.bz2.asc) = d9725a343fb0ac275bba96c42a497b3d2e4260699bb1d299c8838d9ceadc7a2629aa54b80ba04d99d0b6281e24a38cf8cc7c8e70cb8f7921ee338344883dd0df
|
||||
SHA512 (ccid-1.5.0.tar.bz2) = fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
|
||||
SHA512 (ccid-1.5.0.tar.bz2.asc) = 02fa2b13ebf917716668394c6975f1b00e28dd8192b6a733bee415841f34ade7bf68bf0aeb78781f07dc0ef2294f43c6342a03ae6a966136ce2712bb7969d3b3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user