import pcsc-lite-ccid-1.4.36-1.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/ccid-1.4.34.tar.bz2
+SOURCES/ccid-1.4.36.tar.bz2
 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg

.pcsc-lite-ccid.metadata

@@ -1,2 +1,2 @@
-42f3a67f9b451f0b48eb3f37fd0baaaa2d7477b4 SOURCES/ccid-1.4.34.tar.bz2
+ed76f65c5c48411bf602edd87779bcbd9476720a SOURCES/ccid-1.4.36.tar.bz2
 13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg

SOURCES/ccid-1.4.34.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmANcl8ACgkQeKG03+j5
-xX5HDQ/+LYB20Y33yV9wJoydnBgbO7TchUPPeufaO+HnSqjBfgZGD3sgU7wWDWEc
-Fqog1aVCzNK2tug/DRdkrofMgMLCfMhC4MVFKqrYo80aPmBUnZVOt7VZ52QFTl3V
-wYaW9lBcgVIEmjlKpq16fJwod6fF08CvPru9hogSUOx+zSzymz6poar6edJh6qwJ
-+m9RfoiMbu+faoyXcMZVIkPOMlqsBGatlWEryGLG4UUKbAo58BNgX6ez76wpiIX3
-pS5Rp0ePCje+/Ts8ix+paxuF6y8F0kon34k+SyBiw1oJOjh0Nbdb3x7gisSBY+tD
-hqxjhtVr13wae2G0XjqtZvTe/lamSoX7aqSDiygYpCYROc6jlkTA0oI8vX9P/qQN
-FTD5/w73dMT5huV1hnrM4yFejgzPJJPZQa3OnEfdYns6ooXGlkzctXP6V6JDI+oQ
-C3u93DX2N1r7up9nMeBYCcJg3ZNpQIsYFaoqOmx42wNXBKFcGq2pEoBjkVXFCqKZ
-gyYHAy+z+QIZDqb0Ndf1Xgs1MbC1S8J60pSnvcXXCG33oz+U3481Qlnm/mcvstyQ
-kgcvA4QCQFmwvU7oPkimQfKOPaE0UHaecWKIl4wtFTTsqCvr0XWAJesWRhLWT9Eb
-18CP5RFpnW0knaZv6g46Yy21zYK/WDxHi1km6KJbYySkxTxTYN8=
-=LiUx
------END PGP SIGNATURE-----

SOURCES/ccid-1.4.36-etoken.patch

@@ -0,0 +1,94 @@
+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
+
+

SOURCES/ccid-1.4.36.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAmEsohYACgkQeKG03+j5
+xX6Afg//QeixE9OO5UXuFptk+ZFDJz3dKzd1YLQ/korWVrdC9QouHJDHdLHqUW/a
+ls0aPUg2qupj2uwwidYy58EHXGtDd6BZ27Xu7d1pIJcGm8f6+obWw8RJZmzotvDI
+eG+VKtpqXcj4ShCjnDu32QcMZ6XSadeuEzw+Ir8aBHazzb7xcKo1VGsYQ8i1KxPx
+8YDUJ8pme43TOyCoOmrrDVlXb96g13fQ6KAyatDwmiGy2uSkXSQXMKNJ3mkEIipe
+pzDt7epo3dvXTImhIuDGn+rbnSUEKFcjmlB7LSo7vV8iLfmt490b3RWxuUI0UVh9
+FBCuNxUTy58yB9QS8gcqN5ljHC9877H2ACQo/i8AEB1VIP7lahLMS0+9Fn/WWMGo
+gBIijeYVTCJ3VeYbnuFNBWLrGfIXQL/lmEzvs2b4DBR1UIOfe32G9xk+hKNBmRrR
+Nfs/hZGlL4CMuwHsjQ/ULCh5yuryecaWlzHZyRltZUz9DMJyiWKgGQnbk3/IpvzK
+ihiPlp0XRL6ZdrSZnhP8Bydk6g1eHigNzJyzVOZcACIKWKiY+5phhTfsj1L8Z8Rs
+T5a6AFrOwFZFJmFAXYYv8WyXGmPVvLfZbbIes/FNJEfXSUrld7wX8qrmK6+NmkPD
+hs4GOuLlVygt160edufJCl0ZIeo+9DSqUaKyuuF05u4Ay40KoYc=
+=Jttr
+-----END PGP SIGNATURE-----

SPECS/pcsc-lite-ccid.spec

@@ -2,8 +2,8 @@
 %global pcsc_lite_ver 1.8.9
 
 Name:           pcsc-lite-ccid
-Version:        1.4.34
+Version:        1.4.36
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 License:        LGPLv2+
@@ -13,6 +13,7 @@ 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-etoken.patch
 
 BuildRequires: make
 BuildRequires:  perl-interpreter
@@ -40,7 +41,7 @@ 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
@@ -68,6 +69,9 @@ cp -p src/openct/LICENSE LICENSE.openct
 
 
 %changelog
+* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-1
+- Rebase to current version from Fedora (#2017830)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.34-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688