Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
||||||
31
.gitignore
vendored
31
.gitignore
vendored
@ -1,2 +1,29 @@
|
|||||||
SOURCES/ccid-1.4.29.tar.bz2
|
/ccid-*.tar.bz2
|
||||||
SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
|
/ccid-1.4.17.tar.bz2.asc
|
||||||
|
/ccid-1.4.18.tar.bz2.asc
|
||||||
|
/ccid-1.4.19.tar.bz2.asc
|
||||||
|
/ccid-1.4.20.tar.bz2.asc
|
||||||
|
/ccid-1.4.21.tar.bz2.asc
|
||||||
|
/ccid-1.4.22.tar.bz2.asc
|
||||||
|
/ccid-1.4.23.tar.bz2.asc
|
||||||
|
/ccid-1.4.24.tar.bz2.asc
|
||||||
|
/ccid-1.4.25.tar.bz2.asc
|
||||||
|
/ccid-1.4.26.tar.bz2.asc
|
||||||
|
/ccid-1.4.27.tar.bz2.asc
|
||||||
|
/ccid-1.4.28.tar.bz2.asc
|
||||||
|
/ccid-1.4.29.tar.bz2.asc
|
||||||
|
/ccid-1.4.30.tar.bz2.asc
|
||||||
|
/ccid-1.4.31.tar.bz2.asc
|
||||||
|
/ccid-1.4.32.tar.bz2.asc
|
||||||
|
/ccid-1.4.33.tar.bz2.asc
|
||||||
|
/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
|
||||||
|
/ccid-1.5.1.tar.bz2.asc
|
||||||
|
/ccid-1.5.2.tar.bz2.asc
|
||||||
|
/ccid-1.5.3.tar.bz2.asc
|
||||||
|
/ccid-1.5.4.tar.bz2.asc
|
||||||
|
/ccid-1.5.5.tar.bz2.asc
|
||||||
|
/ccid-1.6.0.tar.xz
|
||||||
|
/ccid-1.6.0.tar.xz.asc
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
f21605dd2bf82710b69f454b0379ce68fe5aba5e SOURCES/ccid-1.4.29.tar.bz2
|
|
||||||
13df650b9548b4ef1b24ad11ef6b573af4d48011 SOURCES/gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
|
|
||||||
@ -1,269 +0,0 @@
|
|||||||
diff -up ./readers/supported_readers.txt.ccid-1-4-32 ./readers/supported_readers.txt
|
|
||||||
--- ./readers/supported_readers.txt.ccid-1-4-32 2020-06-11 14:20:29.227303776 -0700
|
|
||||||
+++ ./readers/supported_readers.txt 2020-06-11 14:48:09.968252737 -0700
|
|
||||||
@@ -125,19 +125,29 @@
|
|
||||||
0x0DB5:0x0138:Access IS ePassport Reader
|
|
||||||
0x0DB5:0x0160:Access IS NFC Smart Module
|
|
||||||
0x0DB5:0x0164:Access IS NFC Smart Module
|
|
||||||
+0x0DB5:0x0170:Access IS ATR210
|
|
||||||
+0x0DB5:0x0180:Access IS ATR220
|
|
||||||
|
|
||||||
# ACS
|
|
||||||
0x072F:0x1204:ACS ACR101 ICC Reader
|
|
||||||
0x072F:0x221A:ACS ACR1251 Dual Reader
|
|
||||||
0x072F:0x223B:ACS ACR1252 Dual Reader
|
|
||||||
+0x072F:0x223E:ACS ACR1252 Reader
|
|
||||||
0x072F:0x223F:ACS ACR1255U-J1
|
|
||||||
0x072F:0x8201:ACS APG8201 PINhandy 1
|
|
||||||
0x072F:0x8202:ACS APG8201 USB Reader
|
|
||||||
+0x072F:0x8300:ACS ACR33 ICC Reader
|
|
||||||
0x072F:0x90DB:ACS CryptoMate64
|
|
||||||
0x072F:0xB000:ACS ACR3901U ICC Reader
|
|
||||||
0x072F:0xB100:ACS ACR39U ICC Reader
|
|
||||||
0x072F:0xB106:ACS CryptoMate (T2)
|
|
||||||
|
|
||||||
+# AF Care
|
|
||||||
+0x1C34:0xAFC0:AF Care One
|
|
||||||
+0x1C34:0xAFC1:AF Care One
|
|
||||||
+0x1C34:0xAFC2:AF Care Two
|
|
||||||
+0x1C34:0xAFC3:AF Care Two
|
|
||||||
+
|
|
||||||
# AK910
|
|
||||||
0x2021:0x0001:AK910 CKey
|
|
||||||
0x2021:0x0011:AK910 CKey
|
|
||||||
@@ -161,9 +171,13 @@
|
|
||||||
0x24DC:0x0201:Aladdin R.D. JCR-770
|
|
||||||
0x24DC:0x0401:Aladdin R.D. JC-WebPass (JC600)
|
|
||||||
0x24DC:0x0402:Aladdin R.D. JaCarta
|
|
||||||
+0x24DC:0x0428:Aladdin R.D. JaCartaReader
|
|
||||||
0x24DC:0x0501:Aladdin R.D. JaCarta U2F (JC602)
|
|
||||||
0x24DC:0x100F:Aladdin R.D. JaCarta Flash
|
|
||||||
|
|
||||||
+# Alcor Link
|
|
||||||
+0x2CE3:0x9563:Alcor Link AK9563
|
|
||||||
+
|
|
||||||
# Alcor Micro
|
|
||||||
0x058F:0x9522:Alcor Micro AU9522
|
|
||||||
|
|
||||||
@@ -192,9 +206,13 @@
|
|
||||||
0x03EB:0x6012:ATMEL VaultIC420 Smart Object
|
|
||||||
0x03EB:0x6014:ATMEL VaultIC440
|
|
||||||
|
|
||||||
+# AvestUA
|
|
||||||
+0xC1A6:0x0131:AvestUA AvestKey
|
|
||||||
+
|
|
||||||
# Avtor
|
|
||||||
0x15CF:0x0019:Avtor SecureToken
|
|
||||||
0x15CF:0x001D:Avtor SC Reader 371
|
|
||||||
+0x15CF:0x0020:Avtor SecureToken
|
|
||||||
|
|
||||||
# Axalto
|
|
||||||
0x04E6:0x511C:Axalto Reflex USB v3
|
|
||||||
@@ -203,6 +221,7 @@
|
|
||||||
0x23A0:0x0001:BIFIT USB-Token iBank2key
|
|
||||||
0x23A0:0x0002:BIFIT iBank2Key
|
|
||||||
0x23A0:0x0003:BIFIT iToken
|
|
||||||
+0x23A0:0x0008:BIFIT ANGARA
|
|
||||||
|
|
||||||
# Bit4id
|
|
||||||
0x25DD:0x1101:Bit4id miniLector-s
|
|
||||||
@@ -213,7 +232,10 @@
|
|
||||||
0x25DD:0x2351:Bit4id Digital DNA Key
|
|
||||||
0x25DD:0x2361:Bit4id Digital-DNA Key BT
|
|
||||||
0x25DD:0x2362:Bit4id Digital-DNA Key
|
|
||||||
+0x25DD:0x2371:Bit4id TokenME EVO v2
|
|
||||||
0x25DD:0x3111:Bit4id miniLector
|
|
||||||
+0x25DD:0x3211:Bit4id miniLector AIR EVO
|
|
||||||
+0x25DD:0xB001:Bit4id miniLector Blue
|
|
||||||
|
|
||||||
# Bluink Ltd.
|
|
||||||
0x2ABE:0x1003:Bluink Ltd. Bluink CCID
|
|
||||||
@@ -227,6 +249,10 @@
|
|
||||||
0x0A5C:0x5832:Broadcom Corp 5880
|
|
||||||
0x0A5C:0x5833:Broadcom Corp 5880
|
|
||||||
0x0A5C:0x5834:Broadcom Corp 5880
|
|
||||||
+0x0A5C:0x5842:Broadcom Corp 58200
|
|
||||||
+0x0A5C:0x5843:Broadcom Corp 58200
|
|
||||||
+0x0A5C:0x5844:Broadcom Corp 58200
|
|
||||||
+0x0A5C:0x5845:Broadcom Corp 58200
|
|
||||||
|
|
||||||
# C3PO
|
|
||||||
0x0783:0x0007:C3PO TLTC2USB
|
|
||||||
@@ -240,6 +266,10 @@
|
|
||||||
# CCB
|
|
||||||
0x8829:0xCCB2:CCB eSafeLD
|
|
||||||
|
|
||||||
+# Certgate GmbH
|
|
||||||
+0x2DFF:0xB601:Certgate GmbH AirID 2 USB
|
|
||||||
+0x2DFF:0xB602:Certgate GmbH ONEKEY ID 2 USB
|
|
||||||
+
|
|
||||||
# charismathics
|
|
||||||
0x19E7:0x0002:charismathics plug'n'crypt CCID token
|
|
||||||
|
|
||||||
@@ -257,6 +287,7 @@
|
|
||||||
0x046A:0x005B:Cherry GmbH SmartBoard XX1X
|
|
||||||
0x046A:0x0070:Cherry GmbH SmartTerminal XX1X
|
|
||||||
0x046A:0x0072:Cherry GmbH SmartTerminal ST-1275
|
|
||||||
+0x046A:0x01A2:Cherry GmbH CHERRY SECURE BOARD 1.0
|
|
||||||
|
|
||||||
# Chicony
|
|
||||||
0x04F2:0x0967:Chicony USB Smart Card Keyboard
|
|
||||||
@@ -268,6 +299,15 @@
|
|
||||||
0x0982:0x0008:COVADIS VEGA-ALPHA
|
|
||||||
0x0982:0x0040:COVADIS Auriga
|
|
||||||
|
|
||||||
+# DC.Ltd
|
|
||||||
+0x257B:0xC305:DC.Ltd DC4 5CCID READER
|
|
||||||
+
|
|
||||||
+# Doctolib
|
|
||||||
+0x1C34:0xAFD0:Doctolib SR
|
|
||||||
+0x1C34:0xAFD1:Doctolib SR
|
|
||||||
+0x1C34:0xAFD2:Doctolib SR
|
|
||||||
+0x1C34:0xAFD3:Doctolib SR
|
|
||||||
+
|
|
||||||
# DUALi
|
|
||||||
0x1DB2:0x0801:DUALi DE-620 Combi
|
|
||||||
0x1DB2:0x088B:DUALi DRAGON NFC READER
|
|
||||||
@@ -282,6 +322,9 @@
|
|
||||||
# ESMART
|
|
||||||
0x2CE4:0x7479:ESMART Token GOST
|
|
||||||
|
|
||||||
+# F-Secure Foundry
|
|
||||||
+0x1209:0x2702:F-Secure Foundry USB Armory Mk II
|
|
||||||
+
|
|
||||||
# FEITIAN
|
|
||||||
0x096E:0x0619:FEITIAN iR301
|
|
||||||
0x096E:0x061A:FEITIAN bR301
|
|
||||||
@@ -326,6 +369,7 @@
|
|
||||||
0x08E6:0x3440:GEMALTO CT1100
|
|
||||||
|
|
||||||
# Gemalto
|
|
||||||
+0x0898:0x0101:Gemalto RF CR5400
|
|
||||||
0x08E6:0x2202:Gemalto Gem e-Seal Pro USB Token
|
|
||||||
0x08E6:0x34C1:Gemalto Ezio Shield Secure Channel
|
|
||||||
0x08E6:0x34C2:Gemalto Ezio Shield
|
|
||||||
@@ -345,6 +389,10 @@
|
|
||||||
# Generic USB
|
|
||||||
0x076B:0x3A21:Generic USB Smart Card Reader
|
|
||||||
|
|
||||||
+# Genesys Logic
|
|
||||||
+0x05E3:0x0757:Genesys Logic CCID Card Reader
|
|
||||||
+0x05E3:0x0758:Genesys Logic Combo Card Reader
|
|
||||||
+
|
|
||||||
# German Privacy Foundation
|
|
||||||
0x20A0:0x4107:German Privacy Foundation Crypto Stick v1.2
|
|
||||||
|
|
||||||
@@ -371,6 +419,10 @@
|
|
||||||
# HID
|
|
||||||
|
|
||||||
# HID Global
|
|
||||||
+0x09C3:0x0028:HID Global Crescendo Key
|
|
||||||
+0x09C3:0x0029:HID Global Crescendo Key
|
|
||||||
+0x09C3:0x002B:HID Global Crescendo Key
|
|
||||||
+0x09C3:0x002D:HID Global Crescendo Key
|
|
||||||
0x076B:0x3031:HID Global OMNIKEY 3x21 Smart Card Reader
|
|
||||||
0x076B:0x5022:HID Global OMNIKEY 5022 Smart Card Reader
|
|
||||||
0x076B:0x5023:HID Global OMNIKEY 5023 Smart Card Reader
|
|
||||||
@@ -409,6 +461,7 @@
|
|
||||||
0x04E6:0x581A:Identiv uTrust 3522 embd SE RFID Token
|
|
||||||
0x04E6:0x581B:Identiv uTrust 2910 R Taglio SC Reader
|
|
||||||
0x04E6:0x581C:Identiv SCR35xx USB Smart Card Reader
|
|
||||||
+0x04E6:0x581D:Identiv SCR3500 C Contact Reader
|
|
||||||
|
|
||||||
# Identive
|
|
||||||
0x04E6:0x5710:Identive CLOUD 2700 F Smart Card Reader
|
|
||||||
@@ -428,8 +481,12 @@
|
|
||||||
0x03EB:0x9308:IIT E.Key Crystal-1
|
|
||||||
0x03EB:0x9324:IIT E.Key Almaz-1C
|
|
||||||
|
|
||||||
+# InfoCert
|
|
||||||
+0x2FD2:0x0100:InfoCert WirelessKey
|
|
||||||
+
|
|
||||||
# InfoThink
|
|
||||||
0x1FC9:0x0102:InfoThink IT-102MU Reader
|
|
||||||
+0x1403:0x7506:InfoThink IT-500U Reader
|
|
||||||
|
|
||||||
# Inside Secure
|
|
||||||
0x2406:0x6300:Inside Secure VaultIC 420 Smart Object
|
|
||||||
@@ -475,6 +532,7 @@
|
|
||||||
|
|
||||||
# Ledger
|
|
||||||
0x2C97:0x0001:Ledger Nano S
|
|
||||||
+0x2C97:0x0004:Ledger Nano X
|
|
||||||
|
|
||||||
# Lenovo
|
|
||||||
0x17EF:0x6007:Lenovo Lenovo USB Smartcard Keyboard
|
|
||||||
@@ -526,6 +584,7 @@
|
|
||||||
# NXP
|
|
||||||
0x1FC9:0x0107:NXP Pegoda 2 N
|
|
||||||
0x1FC9:0x010B:NXP PR533
|
|
||||||
+0x1FC9:0x0117:NXP PN7462AU CCID
|
|
||||||
|
|
||||||
# OBERTHUR TECHNOLOGIES
|
|
||||||
0x1A74:0xB111:OBERTHUR TECHNOLOGIES ID-ONE TOKEN SLIM v2
|
|
||||||
@@ -563,6 +622,9 @@
|
|
||||||
# Planeta
|
|
||||||
0x21AB:0x0010:Planeta RC700-NFC CCID
|
|
||||||
|
|
||||||
+# Purism, SPC
|
|
||||||
+0x316D:0x4C4B:Purism, SPC Librem Key
|
|
||||||
+
|
|
||||||
# Raritan
|
|
||||||
0x14DD:0x1006:Raritan D2CIM-DVUSB VM/CCID
|
|
||||||
|
|
||||||
@@ -579,6 +641,9 @@
|
|
||||||
# Rocketek
|
|
||||||
0x14CD:0x8166:Rocketek RT-SCR1
|
|
||||||
|
|
||||||
+# Route1
|
|
||||||
+0x13FE:0xC831:Route1 MobiKEY Fusion3
|
|
||||||
+
|
|
||||||
# SafeNet
|
|
||||||
0x0529:0x0602:SafeNet eToken 7300
|
|
||||||
0x0529:0x0620:SafeNet eToken 5100
|
|
||||||
@@ -618,7 +683,21 @@
|
|
||||||
# Softforum Co., Ltd
|
|
||||||
0x04E8:0x0007:Softforum Co., Ltd XecureHSM
|
|
||||||
|
|
||||||
+# SPECINFOSYSTEMS
|
|
||||||
+0x316E:0x0001:SPECINFOSYSTEMS DIAMOND token
|
|
||||||
+0x316E:0x0002:SPECINFOSYSTEMS DIAMOND PRO token
|
|
||||||
+0x316E:0x0003:SPECINFOSYSTEMS DIAMOND PLUS token
|
|
||||||
+0x316E:0x0010:SPECINFOSYSTEMS DIAMOND HSM
|
|
||||||
+
|
|
||||||
# SpringCard
|
|
||||||
+0x1C34:0x6012:SpringCard SpringCore
|
|
||||||
+0x1C34:0x601A:SpringCard SpringCore
|
|
||||||
+0x1C34:0x6112:SpringCard E518
|
|
||||||
+0x1C34:0x611A:SpringCard E518
|
|
||||||
+0x1C34:0x6122:SpringCard H518
|
|
||||||
+0x1C34:0x612A:SpringCard H518
|
|
||||||
+0x1C34:0x6132:SpringCard Puck
|
|
||||||
+0x1C34:0x613A:SpringCard Puck
|
|
||||||
0x1C34:0x7113:SpringCard CrazyWriter
|
|
||||||
0x1C34:0x7121:SpringCard CSB6 Basic
|
|
||||||
0x1C34:0x7123:SpringCard CSB6 Secure
|
|
||||||
@@ -633,11 +712,15 @@
|
|
||||||
# Spyrus Inc
|
|
||||||
0x08DF:0x0004:Spyrus Inc Rosetta USB
|
|
||||||
0x08DF:0x3115:Spyrus Inc WorkSafe Pro
|
|
||||||
+0x08DF:0x3117:Spyrus Inc WorkSafe Pro
|
|
||||||
0x08DF:0x3201:Spyrus Inc PocketVault P-3X
|
|
||||||
|
|
||||||
# SYNNIX
|
|
||||||
0x1206:0x2105:SYNNIX STD200
|
|
||||||
|
|
||||||
+# Sysking
|
|
||||||
+0x0E6A:0x5083:Sysking MII136C
|
|
||||||
+
|
|
||||||
# Teridian Semiconductors
|
|
||||||
0x1862:0x0000:Teridian Semiconductors TSC12xxFV.09
|
|
||||||
|
|
||||||
@@ -858,6 +941,7 @@
|
|
||||||
#0x076B:0xA022:XIRING Teo (Teo.txt)
|
|
||||||
|
|
||||||
#0x08E6:0x3437:Gemalto PC Twin Reader (GemPCTwin.txt)
|
|
||||||
+#0x08E6:0x3437:Gemalto PC Twin Reader (serial) (GemPCTwinSerial.txt)
|
|
||||||
#0x08E6:0x3437:Gemalto IDBridge CT30 (Gemalto_IDBridge_CT30.txt)
|
|
||||||
#0x08E6:0x3437:Gemalto K50 (Gemalto_K50.txt)
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up ./src/ccid_ifdhandler.h.readers_32 ./src/ccid_ifdhandler.h
|
|
||||||
--- ./src/ccid_ifdhandler.h.readers_32 2018-08-20 16:06:34.080905748 -0700
|
|
||||||
+++ ./src/ccid_ifdhandler.h 2018-08-20 16:07:04.638097096 -0700
|
|
||||||
@@ -47,7 +47,7 @@ extern int DriverOptions;
|
|
||||||
* The maximum number of readers is also limited in pcsc-lite (16 by default)
|
|
||||||
* see the definition of PCSCLITE_MAX_READERS_CONTEXTS in src/PCSC/pcsclite.h
|
|
||||||
*/
|
|
||||||
-#define CCID_DRIVER_MAX_READERS 16
|
|
||||||
+#define CCID_DRIVER_MAX_READERS 48
|
|
||||||
|
|
||||||
/*
|
|
||||||
* CCID driver specific functions
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEE9eEbn/6REUb0HZU9eKG03+j5xX4FAlqNMrsACgkQeKG03+j5
|
|
||||||
xX40SQ//aKOwy7IlntVNrLhD0udAjPHXJZuKjAg7PSxnNxUXhFl8m9RXbF/NHvHF
|
|
||||||
lIDda6iq7fBaXLwOwSSOMRTQyQoMsRT6eBcjeJnhBzT06DwTcgajvQyOBBEJOJDh
|
|
||||||
5kjsPBSOb0w92C+VxArpZO78Mz5Ifo0P+2p8Xy2l8/QcrYG2yJEHfNI1kq37BSBI
|
|
||||||
nZJCMMknQrkADi88cyArwUT6+Pf6HUKssyw1ug7JR3qDmBc7NaUHVfHi8zPBsOnh
|
|
||||||
Ln27RAZZMiG0ikDpze06y++vIgifDVn2vuUGE2OJFXnst6R3yarFQ0AM2d7+x7a7
|
|
||||||
BWPgFVFuPbxDOBHeqDQsU/CzM6TmhXz9vB7fwBpObfiqJ5WIEwE0vo5Ym/wroIEc
|
|
||||||
7u2cFXhJMhywaepv3ZuPgDgg5NH0uF+2MQgRADDbczNFLUv7RoizdL0VEKlrBhba
|
|
||||||
ogpVE9/+Yci4MeArrFLu4XCH1VJSorBoagZgD9Ur+oNEfC4p9LQQpABZUPUmU2IC
|
|
||||||
frkScS2R5TLSNtalgCtytOYvdOrwtm3m5+LArBwBixS7jlFVnSU3z05Guujajrth
|
|
||||||
Bfzca9n7Bv51XtbkI9NRFObFLuYWTBPXTkjof7NnD5W+N8wvsBXxa5KJ8qxgeNEV
|
|
||||||
TMWNmTocmJN3EM/dzoaT8pR327OD8lRL0d2f8N1MFefChO2pPDE=
|
|
||||||
=pLJ7
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
@ -23,7 +23,7 @@ diff -up ccid-1.4.26/src/ccid.h.omnikey ccid-1.4.26/src/ccid.h
|
|||||||
+++ ccid-1.4.26/src/ccid.h 2017-02-24 10:04:25.742132234 +0100
|
+++ ccid-1.4.26/src/ccid.h 2017-02-24 10:04:25.742132234 +0100
|
||||||
@@ -137,6 +137,7 @@ typedef struct
|
@@ -137,6 +137,7 @@ typedef struct
|
||||||
*/
|
*/
|
||||||
char zlp;
|
bool zlp;
|
||||||
#endif
|
#endif
|
||||||
+ unsigned int dwNonStandardFlags;
|
+ unsigned int dwNonStandardFlags;
|
||||||
} _ccid_descriptor;
|
} _ccid_descriptor;
|
||||||
@ -123,9 +123,9 @@ diff -up ccid-1.4.26/src/commands.c.omnikey ccid-1.4.26/src/commands.c
|
|||||||
*rx_length = length;
|
*rx_length = length;
|
||||||
else
|
else
|
||||||
@@ -1581,7 +1630,7 @@ time_request:
|
@@ -1581,7 +1630,7 @@ time_request:
|
||||||
return_value = IFD_COMMUNICATION_ERROR;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
if (length)
|
||||||
- memcpy(rx_buffer, cmd+10, length);
|
- memcpy(rx_buffer, cmd+10, length);
|
||||||
+ memcpy(rx_buffer, rx_ptr, length);
|
+ memcpy(rx_buffer, rx_ptr, length);
|
||||||
|
|
||||||
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}
|
||||||
BIN
gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
Normal file
BIN
gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
Normal file
Binary file not shown.
@ -1,27 +1,27 @@
|
|||||||
%global dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
|
%global dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
|
||||||
%global pcsc_lite_ver 1.8.9
|
%global pcsc_lite_ver 1.8.9
|
||||||
%global upstream_build 4238
|
|
||||||
|
|
||||||
Name: pcsc-lite-ccid
|
Name: pcsc-lite-ccid
|
||||||
Version: 1.4.29
|
Version: 1.6.0
|
||||||
Release: 5.1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Generic USB CCID smart card reader driver
|
Summary: Generic USB CCID smart card reader driver
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||||
License: LGPLv2+
|
URL: https://ccid.apdu.fr/files
|
||||||
URL: http://pcsclite.alioth.debian.org/ccid.html
|
Source0: https://ccid.apdu.fr/files/ccid-%{version}.tar.xz
|
||||||
Source0: https://alioth.debian.org/frs/download.php/file/%{upstream_build}/ccid-%{version}.tar.bz2
|
Source1: https://ccid.apdu.fr/files/ccid-%{version}.tar.xz.asc
|
||||||
Source1: ccid-%{version}.tar.bz2.asc
|
|
||||||
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
|
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
|
||||||
Patch0: ccid-1.4.26-omnikey-3121.patch
|
Patch0: ccid-1.4.26-omnikey-3121.patch
|
||||||
Patch1: ccid-1.4.29-maxreaders.patch
|
|
||||||
Patch2: ccid-1.4.29-add-ccid-1.4.32-readers.patch
|
|
||||||
|
|
||||||
|
BuildRequires: meson
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: perl-interpreter
|
BuildRequires: perl-interpreter
|
||||||
BuildRequires: perl-Getopt-Long
|
BuildRequires: perl-Getopt-Long
|
||||||
BuildRequires: libusb1-devel
|
BuildRequires: libusb1-devel
|
||||||
BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver}
|
BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver}
|
||||||
BuildRequires: gnupg2 gcc
|
BuildRequires: gnupg2
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: zlib-devel
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Requires: pcsc-lite%{?_isa} >= %{pcsc_lite_ver}
|
Requires: pcsc-lite%{?_isa} >= %{pcsc_lite_ver}
|
||||||
@ -29,6 +29,8 @@ Provides: pcsc-ifd-handler
|
|||||||
# Provide upgrade path from 'ccid' package
|
# Provide upgrade path from 'ccid' package
|
||||||
Obsoletes: ccid < 1.4.0-3
|
Obsoletes: ccid < 1.4.0-3
|
||||||
Provides: ccid = %{version}-%{release}
|
Provides: ccid = %{version}-%{release}
|
||||||
|
# This is bundled from pcsc-lite upstream
|
||||||
|
Provides: bundled(simclist) = 1.6
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Generic USB CCID (Chip/Smart Card Interface Devices) driver for use with the
|
Generic USB CCID (Chip/Smart Card Interface Devices) driver for use with the
|
||||||
@ -38,17 +40,15 @@ PC/SC Lite daemon.
|
|||||||
%prep
|
%prep
|
||||||
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||||
%setup -q -n ccid-%{version}
|
%setup -q -n ccid-%{version}
|
||||||
%patch0 -p1 -b .omnikey
|
%patch 0 -p1 -b .omnikey
|
||||||
%patch1 -p0 -b .maxreaders
|
|
||||||
%patch2 -p1 -b .ccid-1-4-32
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-twinserial
|
%meson -Dserial=true
|
||||||
make %{?_smp_mflags}
|
|
||||||
|
|
||||||
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
%meson_install
|
||||||
cp -p src/openct/LICENSE LICENSE.openct
|
cp -p src/openct/LICENSE LICENSE.openct
|
||||||
|
|
||||||
|
|
||||||
@ -60,30 +60,110 @@ cp -p src/openct/LICENSE LICENSE.openct
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS ChangeLog COPYING LICENSE.openct README
|
%doc AUTHORS README.md
|
||||||
|
%license COPYING LICENSE.openct
|
||||||
%{dropdir}/ifd-ccid.bundle/
|
%{dropdir}/ifd-ccid.bundle/
|
||||||
%{dropdir}/serial/
|
%{dropdir}/serial/
|
||||||
%config(noreplace) %{_sysconfdir}/reader.conf.d/libccidtwin
|
%config(noreplace) %{_sysconfdir}/reader.conf.d/libccidtwin
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.4.29-5.1
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.0-2
|
||||||
- rebuild to retrigger CI
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
* Thu Jun 17 2021 Bob Relyea <rrelyea@redhat.com> - 1.4.29-5
|
* Tue Jul 02 2024 Jakub Jelen <jjelen@redhat.com> - 1.6.0-1
|
||||||
- Increase readers from 32 to 48.
|
- New upstream release with meson build system (#2284336)
|
||||||
|
|
||||||
* Thu Jun 11 2020 Bob Relyea <rrelyea@redhat.com> - 1.4.29-4
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.5-4
|
||||||
- update the reader list from new readers added to upstream ccid 1.4.32
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
* Fri Sep 7 2018 Bob Relyea <rrelyea@redhat.com> - 1.4.29-3.1
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-3
|
||||||
- Test gating
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Sep 7 2018 Bob Relyea <rrelyea@redhat.com> - 1.4.29-3
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
|
||||||
- fix broken dist variable in spec file.
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Aug 24 2018 Bob Relyea <rrelyea@redhat.com> - 1.4.29-2
|
* Mon Jan 08 2024 Jakub Jelen <jjelen@redhat.com> - 1.5.5-1
|
||||||
- Increase readers from 16 to 32.
|
- New upstream release (#2257041)
|
||||||
|
|
||||||
|
* Mon Oct 30 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.4-1
|
||||||
|
- New upstream release fixing regression in previous (#2246459)
|
||||||
|
|
||||||
|
* Fri Oct 27 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.3-1
|
||||||
|
- New upstream release (#2246459)
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 01 2023 Jakub Jelen <jjelen@redhat.com> - 1.5.2-1
|
||||||
|
- New upstream release (#2166005)
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 16 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.1-1
|
||||||
|
- New upstream release (#2142976)
|
||||||
|
|
||||||
|
* Tue Nov 01 2022 Jakub Jelen <jjelen@redhat.com> - 1.5.0-3
|
||||||
|
- Remove downstream patch breaking flatpak (#2054826)
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Fri Oct 15 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-2
|
||||||
|
- Fix eToken support (#2014312)
|
||||||
|
|
||||||
|
* Tue Aug 31 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.36-1
|
||||||
|
- New upstream release (#1999233)
|
||||||
|
|
||||||
|
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.35-1
|
||||||
|
- New upstream release (#1985861)
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.34-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-2
|
||||||
|
- Add support for more readers
|
||||||
|
|
||||||
|
* Fri Feb 05 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.33-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.33-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 25 2020 Jakub Jelen <jjelen@redhat.com> - 1.4.33-1
|
||||||
|
- New upstream release (#1851217)
|
||||||
|
|
||||||
|
* Wed Apr 22 2020 Jakub Jelen <jjelen@redhat.com> - 1.4.32-1
|
||||||
|
- New upstream release (#1826675)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.31-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Jakub Jelen <jjelen@redhat.com> - 1.4.31-1
|
||||||
|
- New upstream release (#1742657)
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.30-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.30-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 20 2018 Jakub Jelen <jjelen@redhat.com> - 1.4.30-1
|
||||||
|
- New upstream release (#1651350)
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.29-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 21 2018 Jakub Jelen <jjelen@redhat.com> - 1.4.29-1
|
* Wed Feb 21 2018 Jakub Jelen <jjelen@redhat.com> - 1.4.29-1
|
||||||
- New upstream release (#1547482)
|
- New upstream release (#1547482)
|
||||||
23
plans/ci.fmf
Normal file
23
plans/ci.fmf
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
/fips-disabled-buildroot-disabled:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/smart-cards
|
||||||
|
name: /plans/ci/fips-disabled-buildroot-disabled
|
||||||
|
|
||||||
|
/fips-disabled-buildroot-enabled:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/smart-cards
|
||||||
|
name: /plans/ci/fips-disabled-buildroot-enabled
|
||||||
|
|
||||||
|
/fips-enabled-buildroot-disabled:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/smart-cards
|
||||||
|
name: /plans/ci/fips-enabled-buildroot-disabled
|
||||||
|
|
||||||
|
/fips-enabled-buildroot-enabled:
|
||||||
|
plan:
|
||||||
|
import:
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/smart-cards
|
||||||
|
name: /plans/ci/fips-enabled-buildroot-enabled
|
||||||
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
SHA512 (ccid-1.6.0.tar.xz) = e26a28531e8f2e82d49d0f5caa769ae1197d5d88d9fe6d79a4943f460be6c0e603e3f6f0dc224216d3d697df0749a5d9c83836d66f63999d9755c17539e96b2c
|
||||||
|
SHA512 (ccid-1.6.0.tar.xz.asc) = 694b041f5a9a2fa11255db562fb72058bd047bba3befcfd7dce2008c3a7a6efe4340972590ec4815a601c1db8c6de833d36f5e2525965ee9b8e3c3c4837a3a86
|
||||||
Loading…
Reference in New Issue
Block a user