2 files changed, 470 insertions, 464 deletions

diff --git a/analysis/countermeasures/cplc.txt b/analysis/countermeasures/CARDS.md
index 77b9831..8200799 100644
--- a/analysis/countermeasures/cplc.txt
+++ b/analysis/countermeasures/CARDS.md
@@ -1,52 +1,61 @@
------------------------------------------------------------------------------------------------------------
-S1/S2 (TAiSYS SIMoME VAULT)
-Card ATR: 3B 9F 95 80 3F C7 A0 80 31 E0 73 FA 21 10 63 00 00 00 83 F0 90 00 BB
+This document summarizes the cards tested during our analysis.
 
-CPLC: ICFabricator=FFFF
-      ICType=FFFF
-      OperatingSystemID=FFFF
-      OperatingSystemReleaseDate=FFFF (invalid date format)
-      OperatingSystemReleaseLevel=FFFF
-      ICFabricationDate=6194 (2016-07-12)
-      ICSerialNumber=EA7F2188
-      ICBatchIdentifier=665D
-      ICModuleFabricator=FFFF
-      ICModulePackagingDate=FFFF (invalid date format)
-      ICCManufacturer=FFFF
-      ICEmbeddingDate=FFFF (invalid date format)
-      ICPrePersonalizer=FFFF
-      ICPrePersonalizationEquipmentDate=FFFF (invalid date format)
-      ICPrePersonalizationEquipmentID=FFFFFFFF
-      ICPersonalizer=FFFF
-      ICPersonalizationDate=FFFF (invalid date format)
-      ICPersonalizationEquipmentID=FFFFFFFF
+Note that several smartcards really are the same model and thus we merged them in the paper:
+ - N4 = N5 = N10
+ - N6 = N7
+ - N3 = N8
+
+# NXP
+
+## N1
+
+**Name**: NXP J3A081 JCOP v2.4.1
+**Card ATR**: `3B F8 18 00 FF 81 31 FE 45 4A 43 4F 50 76 32 34 31 43`
+
+```
+CPLC: ICFabricator=4790
+      ICType=5168
+      OperatingSystemID=4791
+      OperatingSystemReleaseDate=0078 (2010-03-19)
+      OperatingSystemReleaseLevel=3400
+      ICFabricationDate=1329 (2011-11-25)
+      ICSerialNumber=01447395
+      ICBatchIdentifier=7689
+      ICModuleFabricator=4812
+      ICModulePackagingDate=1336 (2011-12-02)
+      ICCManufacturer=0000
+      ICEmbeddingDate=0000 (2010-01-01)
+      ICPrePersonalizer=092C
+      ICPrePersonalizationEquipmentDate=2D31 (invalid date format)
+      ICPrePersonalizationEquipmentID=34343733
+      ICPersonalizer=0000
+      ICPersonalizationDate=0000 (2010-01-01)
+      ICPersonalizationEquipmentID=00000000
 
-IIN: 42074953445F49494E
-CIN: 45074953445F43494E
-KDD: CF0A112233445566778899AA
-SSC: C10200E9
 Card Data: 
 Tag 6: 1.2.840.114283.1
 -> Global Platform card
-Tag 60: 1.2.840.114283.2.2.2
--> GP Version: 2.2
+Tag 60: 1.2.840.114283.2.2.1.1
+-> GP Version: 2.1.1
 Tag 63: 1.2.840.114283.3
--> GP card is uniquely identified by the Issuer Identification Number (IIN) and Card Image Number (CIN)
-Tag 6: 1.2.840.114283.4.2.85
--> GP SCP02 (i=55)
-Tag 66: 1.3.6.1.4.1.42.2.110.1.16
+Tag 64: 1.2.840.114283.4.2.21
+-> GP SCP02 i=15
+Tag 65: 1.3.656.840.100.2.1.3
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
 Card Capabilities: 
+Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
+Key version suggests factory keys
+```
 
------------------------------------------------------------------------------------------------------------
-N3 (NXP JCOP v2.4.2 R3 J2E145G)
-
-Not responding.
-
-
------------------------------------------------------------------------------------------------------------
-N2 (NXP JCOP v2.4.1R3)
-Card ATR: 3B F8 13 00 00 81 31 FE 45 4A 43 4F 50 76 32 34 31 B7 
+# N2
 
+**Name**: NXP JCOP v2.4.1R3
+**Card ATR**: `3B F8 13 00 00 81 31 FE 45 4A 43 4F 50 76 32 34 31 B7`
+ 
+```
 CPLC: ICFabricator=4790
       ICType=5167
       OperatingSystemID=4791
@@ -79,23 +88,269 @@ Tag 6: 1.2.840.114283.4.2.21
 -> GP SCP02 (i=15)
 Tag 66: 1.3.6.1.4.1.42.2.110.1.2
 -> JavaCard v2
+```
 
------------------------------------------------------------------------------------------------------------
-F2 (Javacos JC30M48 CR)
-Card ATR: 3B 90 95 80 11 FE 6A 
+## N3
+
+**Name**: NXP JCOP v2.4.2 R3 J2E145G
+
+## N4 
+
+**Name**: NXP JCOP3 J3H145
+**Card ATR**: `3B 94 95 81 01 46 54 56 01 C4`
+**IDENTIFY response**: `010c0032423245a805d840a842290208030000000000000003104a7848797979303031393739303430300408c3762e82db03cb58050137` -> JxHyyy0019790400
+
+```
+CPLC: ICFabricator=4790
+      ICType=0503
+      OperatingSystemID=8211
+      OperatingSystemReleaseDate=6351 (2016-12-16)
+      OperatingSystemReleaseLevel=0302
+      ICFabricationDate=8359 (2018-12-25)
+      ICSerialNumber=01498607
+      ICBatchIdentifier=4673
+      ICModuleFabricator=4E30
+      ICModulePackagingDate=5038 (2015-02-07)
+      ICCManufacturer=3532
+      ICEmbeddingDate=4246 (2014-09-03)
+      ICPrePersonalizer=4A31
+      ICPrePersonalizationEquipmentDate=3031 (2013-01-31)
+      ICPrePersonalizationEquipmentID=34393836
+      ICPersonalizer=0600
+      ICPersonalizationDate=0123 (2010-05-03)
+      ICPersonalizationEquipmentID=B1BB6E97
+
+IIN: 420100
+CIN: 45080000000000000000
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.1.1
+-> GP Version: 2.1.1
+Tag 63: 1.2.840.114283.3
+Tag 64: 1.2.840.114283.4.2.85
+-> GP SCP02 i=55
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
+Card Capabilities: 
+Supports: SCP02 i=55
+Supports: SCP03 i=00 i=10 with AES-128 AES-196 AES-256
+Supported DOM privileges: SecurityDomain, CardLock, CardTerminate, CardReset, CVMManagement, TrustedPath, AuthorizedManagement, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration
+Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
+Supported LFDB hash: 02
+Supported Token Verification ciphers: 01020840
+Supported Receipt Generation ciphers: 0408
+Supported DAP Verification ciphers: 01020840
+Supported ECC Key Parameters: 0102030405
+Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
+Key version suggests factory keys
+```
+
+## N5
+
+**Name**: NXP JCOP3 P60
+
+## N6/N7
+
+**Name**: NXP JCOP J3R280 P71 
+**Card ATR**: `3B D5 18 FF 81 91 FE 1F C3 80 73 C8 21 10 0A`
+**IDENTIFY response**: `010c0001a48400fe32aabdde5f7c0208000000000000000103184a335233353130323336333130343030dce5c19cfe6d0dcf05010007010108082e5ad88409c9bdb` -> J3R3510236310400
+
+```
+CPLC: ICFabricator=4790
+      ICType=D321
+      OperatingSystemID=4700
+      OperatingSystemReleaseDate=0000 (2010-01-01)
+      OperatingSystemReleaseLevel=0000
+      ICFabricationDate=0136 (2010-05-16)
+      ICSerialNumber=27339899
+      ICBatchIdentifier=5382
+      ICModuleFabricator=0000
+      ICModulePackagingDate=0000 (2010-01-01)
+      ICCManufacturer=0000
+      ICEmbeddingDate=0000 (2010-01-01)
+      ICPrePersonalizer=0C0E
+      ICPrePersonalizationEquipmentDate=5937 (invalid date format)
+      ICPrePersonalizationEquipmentID=33333938
+      ICPersonalizer=0000
+      ICPersonalizationDate=0000 (2010-01-01)
+      ICPersonalizationEquipmentID=00000000
+
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.3
+-> GP Version: 2.3
+Tag 63: 1.2.840.114283.3
+Tag 64: 1.2.840.114283.4.3.112
+-> GP SCP03 i=70
+Tag 65: 1.2.840.114283.5.7.2.0.0
+Tag 66: 1.3.6.1.4.1.42.2.110.1.3
+-> JavaCard v3
+Card Capabilities: 
+Supports: SCP03 i=00 i=10 i=20 i=60 i=70 with AES-128 AES-196 AES-256
+Supported DOM privileges: SecurityDomain, DelegatedManagement, CardReset, MandatedDAPVerification, TrustedPath, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration, CipheredLoadFileDataBlock
+Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
+Supported LFDB hash: 02
+Supported Token Verification ciphers: 7B
+Supported Receipt Generation ciphers: 0C
+Supported DAP Verification ciphers: 7B
+Version:  49 (0x31) ID:   1 (0x01) type: AES  length:  16 (AES-128)
+Version:  49 (0x31) ID:   2 (0x02) type: AES  length:  16 (AES-128)
+Version:  49 (0x31) ID:   3 (0x03) type: AES  length:  16 (AES-128)
+```
 
-KDD: CF0A00000000000000000000
-SSC: C1020019
-Card Data:
 
-https://github.com/crocs-muni/jcalgtest_results/blob/main/javacard/Profiles/results/JavaCardOS_Infineon_JC30M48CR_ALGSUPPORT__3b_80_80_01_01_(provided_by_JavaCardOS_and_Thotheolh_Tay).csv
+## N8 
 
-Likely no keygen?
+**Name**: NXP J2E
+**Card ATR**: `3B F9 13 00 00 81 31 FE 45 4A 43 4F 50 32 34 32 52 33 A2`
 
------------------------------------------------------------------------------------------------------------
-F1 (Javacos A22 CR)
-Card ATR: 3B 9C 95 80 81 1F 03 90 67 46 4A 01 00 54 04 F2 72 FE 00 C0 
+```
+CPLC: ICFabricator=4790
+      ICType=5167
+      OperatingSystemID=4791
+      OperatingSystemReleaseDate=2348 (2012-12-13)
+      OperatingSystemReleaseLevel=4000
+      ICFabricationDate=6007 (2016-01-07)
+      ICSerialNumber=00148398
+      ICBatchIdentifier=1963
+      ICModuleFabricator=4812
+      ICModulePackagingDate=6014 (2016-01-14)
+      ICCManufacturer=0000
+      ICEmbeddingDate=0000 (2010-01-01)
+      ICPrePersonalizer=0127
+      ICPrePersonalizationEquipmentDate=1530 (invalid date format)
+      ICPrePersonalizationEquipmentID=31343833
+      ICPersonalizer=0000
+      ICPersonalizationDate=0000 (2010-01-01)
+      ICPersonalizationEquipmentID=00000000
+
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.2
+-> GP Version: 2.2
+Tag 63: 1.2.840.114283.3
+Tag 64: 1.2.840.114283.4.2.85
+-> GP SCP02 i=55
+Tag 65: 1.3.656.840.100.2.1.3
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
+Card Capabilities: 
+Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
+Key version suggests factory keys
+```
+
+
+## N9
+
+**Name**: NXP JCOP31 v2.4.1 72k
+**Card ATR**: `3B F8 13 00 00 81 31 FE 45 4A 43 4F 50 76 32 34 31 B7`
+
+```
+CPLC: ICFabricator=4790
+      ICType=5040
+      OperatingSystemID=4791
+      OperatingSystemReleaseDate=8102 (2018-04-12)
+      OperatingSystemReleaseLevel=3100
+      ICFabricationDate=1035 (2011-02-04)
+      ICSerialNumber=00216995
+      ICBatchIdentifier=4830
+      ICModuleFabricator=0000
+      ICModulePackagingDate=0000 (2010-01-01)
+      ICCManufacturer=0000
+      ICEmbeddingDate=0000 (2010-01-01)
+      ICPrePersonalizer=0721
+      ICPrePersonalizationEquipmentDate=2630 (invalid date format)
+      ICPrePersonalizationEquipmentID=32313639
+      ICPersonalizer=0000
+      ICPersonalizationDate=0000 (2010-01-01)
+      ICPersonalizationEquipmentID=00000000
+
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.1.1
+-> GP Version: 2.1.1
+Tag 63: 1.2.840.114283.3
+Tag 64: 1.2.840.114283.4.2.21
+-> GP SCP02 i=15
+Tag 65: 1.3.656.840.100.2.1.3
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
+Card Capabilities: 
+Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
+Key version suggests factory keys
+```
+
+## N10
+
+**Name**: NXP J3H145 JCOP3 SECID P60
+**Card ATR**: `3B 94 95 81 01 46 54 56 01 C4`
+
+```
+CPLC: ICFabricator=4790
+      ICType=0503
+      OperatingSystemID=8211
+      OperatingSystemReleaseDate=6351 (2016-12-16)
+      OperatingSystemReleaseLevel=0302
+      ICFabricationDate=8359 (2018-12-25)
+      ICSerialNumber=01891207
+      ICBatchIdentifier=4673
+      ICModuleFabricator=4E30
+      ICModulePackagingDate=5038 (2015-02-07)
+      ICCManufacturer=3532
+      ICEmbeddingDate=4246 (2014-09-03)
+      ICPrePersonalizer=4A31
+      ICPrePersonalizationEquipmentDate=3031 (2013-01-31)
+      ICPrePersonalizationEquipmentID=38393132
+      ICPersonalizer=0600
+      ICPersonalizationDate=0123 (2010-05-03)
+      ICPersonalizationEquipmentID=B148EF84
+
+IIN: 420100
+CIN: 45080000000000000000
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.1.1
+-> GP Version: 2.1.1
+Tag 63: 1.2.840.114283.3
+Tag 64: 1.2.840.114283.4.2.85
+-> GP SCP02 i=55
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
+Card Capabilities: 
+Supports: SCP02 i=55
+Supports: SCP03 i=00 i=10 with AES-128 AES-196 AES-256
+Supported DOM privileges: SecurityDomain, CardLock, CardTerminate, CardReset, CVMManagement, TrustedPath, AuthorizedManagement, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration
+Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
+Supported LFDB hash: 02
+Supported Token Verification ciphers: 01020840
+Supported Receipt Generation ciphers: 0408
+Supported DAP Verification ciphers: 01020840
+Supported ECC Key Parameters: 0102030405
+Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
+Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
+Key version suggests factory keys
+```
 
+# Feitian
+
+## F1
+
+**Name**: Javacos A22 CR
+**Card ATR**: `3B 9C 95 80 81 1F 03 90 67 46 4A 01 00 54 04 F2 72 FE 00 C0`
+
+```
 CPLC: ICFabricator=4090
       ICType=7892
       OperatingSystemID=86AA
@@ -128,19 +383,28 @@ Tag 6: 1.2.840.114283.4.2.85
 -> GP SCP02 (i=55)
 Tag 66: 1.3.6.1.4.1.42.2.110.1.2
 -> JavaCard v2
+```
+
+## F2
+
+**Name**: Javacos JC30M48 CR
+**Card ATR**: `3B 90 95 80 11 FE 6A`
 
------------------------------------------------------------------------------------------------------------
-A1 (ATHENA IDPROTECT)
-Card ATR: 3B D5 18 FF 81 91 FE 1F C3 80 73 C8 21 13 09 
+No proper CPLC reply.
+```
+KDD: CF0A00000000000000000000
+SSC: C1020019
+Card Data:
+```
 
+# Athena
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BD518FF8191FE1FC38073C8211309
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BD518FF8191FE1FC38073C8211309
+## A1
 
+**Name**: Athena IDProtect
+**Card ATR**: `3B D5 18 FF 81 91 FE 1F C3 80 73 C8 21 13 09`
+
+```
 CPLC: ICFabricator=4180
       ICType=010B
       OperatingSystemID=8211
@@ -177,19 +441,16 @@ Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16
 Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
 Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
 Key version suggests factory keys
+```
 
------------------------------------------------------------------------------------------------------------
+# G&D
 
-G1 (GXD 7.0, black usb)
-Card ATR: 3B F9 96 00 00 81 31 FE 45 53 43 45 37 20 0E 00 20 20 28 
+## G1
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Giesecke & Devrient GmbH StarSign CUT S [.] (03170802004922) 00 00
-ATR: 3BF99600008131FE4553434537200E00202028
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BF99600008131FE4553434537200E00202028
+**Name**: G&D Smartcafe 7.0
+**Card ATR**: `3B F9 96 00 00 81 31 FE 45 53 43 45 37 20 0E 00 20 20 28`
 
+```
 CPLC: ICFabricator=0005
       ICType=0056
       OperatingSystemID=D001
@@ -233,18 +494,60 @@ Version: 255 (0xFF) ID:   1 (0x01) type: AES  length:  16 (AES-128)
 Version: 255 (0xFF) ID:   2 (0x02) type: AES  length:  16 (AES-128)
 Version: 255 (0xFF) ID:   3 (0x03) type: AES  length:  16 (AES-128)
 Key version suggests factory keys
+```
+
+## G2
 
------------------------------------------------------------------------------------------------------------
-I1 (SECORA ID S, SLJ52GDT120CS)
-Card ATR: 3B B8 96 00 C0 08 31 FE 45 FF FF 11 54 30 50 23 00 6A 
+**Name**: G&D Smartcafe 6.0
+**Card ATR**: `3B FE 18 00 00 80 31 FE 45 53 43 45 36 30 2D 43 44 30 38 31 2D 6E 46 A9`
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BB89600C00831FE45FFFF1154305023006A
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BB89600C00831FE45FFFF1154305023006A
+```
+CPLC: ICFabricator=4790
+      ICType=5037
+      OperatingSystemID=1671
+      OperatingSystemReleaseDate=1146 (2021-05-26)
+      OperatingSystemReleaseLevel=4003
+      ICFabricationDate=5024 (2025-01-24)
+      ICSerialNumber=970069A3
+      ICBatchIdentifier=7271
+      ICModuleFabricator=4792
+      ICModulePackagingDate=0144 (2020-05-23)
+      ICCManufacturer=1673
+      ICEmbeddingDate=0283 (2020-10-09)
+      ICPrePersonalizer=1674
+      ICPrePersonalizationEquipmentDate=5092 (2015-04-02)
+      ICPrePersonalizationEquipmentID=00000A01
+      ICPersonalizer=0000
+      ICPersonalizationDate=0000 (invalid date format)
+      ICPersonalizationEquipmentID=00000000
 
+KDD: CF0A00005024970069A37271
+SSC: C1020000
+Card Data: 
+Tag 6: 1.2.840.114283.1
+-> Global Platform card
+Tag 60: 1.2.840.114283.2.2.1.1
+-> GP Version: 2.1.1
+Tag 63: 1.2.840.114283.3
+-> GP card is uniquely identified by the Issuer Identification Number (IIN) and Card Image Number (CIN)
+Tag 6: 1.2.840.114283.4.3.0
+-> GP SCP03
+Tag 66: 1.3.6.1.4.1.42.2.110.1.2
+-> JavaCard v2
+Card Capabilities: 
+Version:   1 (0x01) ID:   1 (0x01) type: DES3         length:  16
+Version:   1 (0x01) ID:   2 (0x02) type: DES3         length:  16
+Version:   1 (0x01) ID:   3 (0x03) type: DES3         length:  16
+```
+
+# Infineon
+
+## I1
+
+**Name**: SECORA ID S, SLJ52GDT120CS
+**Card ATR**: `3B B8 96 00 C0 08 31 FE 45 FF FF 11 54 30 50 23 00 6A`
+
+```
 CPLC: ICFabricator=4090
       ICType=1912
       OperatingSystemID=4090
@@ -290,18 +593,14 @@ Version: 255 (0xFF) ID:   1 (0x01) type: AES  length:  32 (AES-256)
 Version: 255 (0xFF) ID:   2 (0x02) type: AES  length:  32 (AES-256)
 Version: 255 (0xFF) ID:   3 (0x03) type: AES  length:  32 (AES-256)
 Key version suggests factory keys
+```
 
------------------------------------------------------------------------------------------------------------
-I2 (CJTOP80K INF SLJ 52GLA080AL M84)
-Card ATR: 3B FE 18 00 00 80 31 FE 45 80 31 80 66 40 90 A5 10 2E 10 83 01 90 00 F2 
+## I2
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BFE1800008031FE45803180664090A5102E1083019000F2
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BFE1800008031FE45803180664090A5102E1083019000F2
+**Name**: CJTOP80K INF SLJ 52GLA080AL M84
+**Card ATR**: `3B FE 18 00 00 80 31 FE 45 80 31 80 66 40 90 A5 10 2E 10 83 01 90 00 F2`
 
+```
 CPLC: ICFabricator=4090
       ICType=7165
       OperatingSystemID=544C
@@ -346,333 +645,61 @@ Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16
 Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
 Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
 Key version suggests factory keys
------------------------------------------------------------------------------------------------------------
-N1 (NXP J3A081 JCOP v2.4.1)
-
-J2 -> concact
-J3 -> dual
-A/D/E/H -> versions
-Card ATR: 3B F8 18 00 FF 81 31 FE 45 4A 43 4F 50 76 32 34 31 43 
-
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BF81800FF8131FE454A434F507632343143
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BF81800FF8131FE454A434F507632343143
-
-CPLC: ICFabricator=4790
-      ICType=5168
-      OperatingSystemID=4791
-      OperatingSystemReleaseDate=0078 (2010-03-19)
-      OperatingSystemReleaseLevel=3400
-      ICFabricationDate=1329 (2011-11-25)
-      ICSerialNumber=01447395
-      ICBatchIdentifier=7689
-      ICModuleFabricator=4812
-      ICModulePackagingDate=1336 (2011-12-02)
-      ICCManufacturer=0000
-      ICEmbeddingDate=0000 (2010-01-01)
-      ICPrePersonalizer=092C
-      ICPrePersonalizationEquipmentDate=2D31 (invalid date format)
-      ICPrePersonalizationEquipmentID=34343733
-      ICPersonalizer=0000
-      ICPersonalizationDate=0000 (2010-01-01)
-      ICPersonalizationEquipmentID=00000000
-
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.1.1
--> GP Version: 2.1.1
-Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.2.21
--> GP SCP02 i=15
-Tag 65: 1.3.656.840.100.2.1.3
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
-Card Capabilities: 
-Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
-Key version suggests factory keys
-
------------------------------------------------------------------------------------------------------------
-N4 
-Not responding.
-Card ATR: 3B 94 95 81 01 46 54 56 01 C4 
-
-
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3B9495810146545601C4
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3B9495810146545601C4
-
-CPLC: ICFabricator=4790
-      ICType=0503
-      OperatingSystemID=8211
-      OperatingSystemReleaseDate=6351 (2016-12-16)
-      OperatingSystemReleaseLevel=0302
-      ICFabricationDate=8359 (2018-12-25)
-      ICSerialNumber=01498607
-      ICBatchIdentifier=4673
-      ICModuleFabricator=4E30
-      ICModulePackagingDate=5038 (2015-02-07)
-      ICCManufacturer=3532
-      ICEmbeddingDate=4246 (2014-09-03)
-      ICPrePersonalizer=4A31
-      ICPrePersonalizationEquipmentDate=3031 (2013-01-31)
-      ICPrePersonalizationEquipmentID=34393836
-      ICPersonalizer=0600
-      ICPersonalizationDate=0123 (2010-05-03)
-      ICPersonalizationEquipmentID=B1BB6E97
-
-IIN: 420100
-CIN: 45080000000000000000
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.1.1
--> GP Version: 2.1.1
-Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.2.85
--> GP SCP02 i=55
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
-Card Capabilities: 
-Supports: SCP02 i=55
-Supports: SCP03 i=00 i=10 with AES-128 AES-196 AES-256
-Supported DOM privileges: SecurityDomain, CardLock, CardTerminate, CardReset, CVMManagement, TrustedPath, AuthorizedManagement, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration
-Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
-Supported LFDB hash: 02
-Supported Token Verification ciphers: 01020840
-Supported Receipt Generation ciphers: 0408
-Supported DAP Verification ciphers: 01020840
-Supported ECC Key Parameters: 0102030405
-Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
-Key version suggests factory keys
------------------------------------------------------------------------------------------------------------
-N5 NXP JCOP3 P60
-HW athena, SW NXP
-Dead
------------------------------------------------------------------------------------------------------------
-N6/N7 NXP JCOP J3R280 P71
-Not responding.
-Card ATR: 3B D5 18 FF 81 91 FE 1F C3 80 73 C8 21 10 0A 
+```
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BD518FF8191FE1FC38073C821100A
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BD518FF8191FE1FC38073C821100A
+# TaiSYS
 
-CPLC: ICFabricator=4790
-      ICType=D321
-      OperatingSystemID=4700
-      OperatingSystemReleaseDate=0000 (2010-01-01)
-      OperatingSystemReleaseLevel=0000
-      ICFabricationDate=0136 (2010-05-16)
-      ICSerialNumber=27339899
-      ICBatchIdentifier=5382
-      ICModuleFabricator=0000
-      ICModulePackagingDate=0000 (2010-01-01)
-      ICCManufacturer=0000
-      ICEmbeddingDate=0000 (2010-01-01)
-      ICPrePersonalizer=0C0E
-      ICPrePersonalizationEquipmentDate=5937 (invalid date format)
-      ICPrePersonalizationEquipmentID=33333938
-      ICPersonalizer=0000
-      ICPersonalizationDate=0000 (2010-01-01)
-      ICPersonalizationEquipmentID=00000000
+## S1/S2
 
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.3
--> GP Version: 2.3
-Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.3.112
--> GP SCP03 i=70
-Tag 65: 1.2.840.114283.5.7.2.0.0
-Tag 66: 1.3.6.1.4.1.42.2.110.1.3
--> JavaCard v3
-Card Capabilities: 
-Supports: SCP03 i=00 i=10 i=20 i=60 i=70 with AES-128 AES-196 AES-256
-Supported DOM privileges: SecurityDomain, DelegatedManagement, CardReset, MandatedDAPVerification, TrustedPath, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration, CipheredLoadFileDataBlock
-Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
-Supported LFDB hash: 02
-Supported Token Verification ciphers: 7B
-Supported Receipt Generation ciphers: 0C
-Supported DAP Verification ciphers: 7B
-Version:  49 (0x31) ID:   1 (0x01) type: AES  length:  16 (AES-128)
-Version:  49 (0x31) ID:   2 (0x02) type: AES  length:  16 (AES-128)
-Version:  49 (0x31) ID:   3 (0x03) type: AES  length:  16 (AES-128)
------------------------------------------------------------------------------------------------------------
-N8 (blue usb) J2E (same as N3? check CPLC)
-
-Card ATR: 3B F9 13 00 00 81 31 FE 45 4A 43 4F 50 32 34 32 52 33 A2 
+**Name**: TAiSYS SIMoME VAULT
+**Card ATR**: `3B 9F 95 80 3F C7 A0 80 31 E0 73 FA 21 10 63 00 00 00 83 F0 90 00 BB`
 
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: OMNIKEY AG 6121 USB mobile 00 00
-ATR: 3BF91300008131FE454A434F503234325233A2
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BF91300008131FE454A434F503234325233A2
-
-CPLC: ICFabricator=4790
-      ICType=5167
-      OperatingSystemID=4791
-      OperatingSystemReleaseDate=2348 (2012-12-13)
-      OperatingSystemReleaseLevel=4000
-      ICFabricationDate=6007 (2016-01-07)
-      ICSerialNumber=00148398
-      ICBatchIdentifier=1963
-      ICModuleFabricator=4812
-      ICModulePackagingDate=6014 (2016-01-14)
-      ICCManufacturer=0000
-      ICEmbeddingDate=0000 (2010-01-01)
-      ICPrePersonalizer=0127
-      ICPrePersonalizationEquipmentDate=1530 (invalid date format)
-      ICPrePersonalizationEquipmentID=31343833
-      ICPersonalizer=0000
-      ICPersonalizationDate=0000 (2010-01-01)
-      ICPersonalizationEquipmentID=00000000
+```
+CPLC: ICFabricator=FFFF
+      ICType=FFFF
+      OperatingSystemID=FFFF
+      OperatingSystemReleaseDate=FFFF (invalid date format)
+      OperatingSystemReleaseLevel=FFFF
+      ICFabricationDate=6194 (2016-07-12)
+      ICSerialNumber=EA7F2188
+      ICBatchIdentifier=665D
+      ICModuleFabricator=FFFF
+      ICModulePackagingDate=FFFF (invalid date format)
+      ICCManufacturer=FFFF
+      ICEmbeddingDate=FFFF (invalid date format)
+      ICPrePersonalizer=FFFF
+      ICPrePersonalizationEquipmentDate=FFFF (invalid date format)
+      ICPrePersonalizationEquipmentID=FFFFFFFF
+      ICPersonalizer=FFFF
+      ICPersonalizationDate=FFFF (invalid date format)
+      ICPersonalizationEquipmentID=FFFFFFFF
 
+IIN: 42074953445F49494E
+CIN: 45074953445F43494E
+KDD: CF0A112233445566778899AA
+SSC: C10200E9
 Card Data: 
 Tag 6: 1.2.840.114283.1
 -> Global Platform card
 Tag 60: 1.2.840.114283.2.2.2
 -> GP Version: 2.2
 Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.2.85
--> GP SCP02 i=55
-Tag 65: 1.3.656.840.100.2.1.3
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
-Card Capabilities: 
-Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
-Key version suggests factory keys
-
------------------------------------------------------------------------------------------------------------
-N9 (NXP JCOP31 v2.4.1 72k)
-Card ATR: 3B F8 13 00 00 81 31 FE 45 4A 43 4F 50 76 32 34 31 B7 
-
-
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3BF81300008131FE454A434F5076323431B7
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3BF81300008131FE454A434F5076323431B7
-
-CPLC: ICFabricator=4790
-      ICType=5040
-      OperatingSystemID=4791
-      OperatingSystemReleaseDate=8102 (2018-04-12)
-      OperatingSystemReleaseLevel=3100
-      ICFabricationDate=1035 (2011-02-04)
-      ICSerialNumber=00216995
-      ICBatchIdentifier=4830
-      ICModuleFabricator=0000
-      ICModulePackagingDate=0000 (2010-01-01)
-      ICCManufacturer=0000
-      ICEmbeddingDate=0000 (2010-01-01)
-      ICPrePersonalizer=0721
-      ICPrePersonalizationEquipmentDate=2630 (invalid date format)
-      ICPrePersonalizationEquipmentID=32313639
-      ICPersonalizer=0000
-      ICPersonalizationDate=0000 (2010-01-01)
-      ICPersonalizationEquipmentID=00000000
-
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.1.1
--> GP Version: 2.1.1
-Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.2.21
--> GP SCP02 i=15
-Tag 65: 1.3.656.840.100.2.1.3
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
-Card Capabilities: 
-Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
-Key version suggests factory keys
-
------------------------------------------------------------------------------------------------------------
-N10 (NXP J3H145 JCOP3 SECID P60)
-Card ATR: 3B 94 95 81 01 46 54 56 01 C4 
-
-
-GlobalPlatformPro v20.01.23-0-g5ad373b
-Running on Linux 6.8.0-52-generic amd64, Java 17.0.14 by Ubuntu
-Reader: Gemalto PC Twin Reader 00 00
-ATR: 3B9495810146545601C4
-More information about your card:
-    http://smartcard-atr.appspot.com/parse?ATR=3B9495810146545601C4
-
-CPLC: ICFabricator=4790
-      ICType=0503
-      OperatingSystemID=8211
-      OperatingSystemReleaseDate=6351 (2016-12-16)
-      OperatingSystemReleaseLevel=0302
-      ICFabricationDate=8359 (2018-12-25)
-      ICSerialNumber=01891207
-      ICBatchIdentifier=4673
-      ICModuleFabricator=4E30
-      ICModulePackagingDate=5038 (2015-02-07)
-      ICCManufacturer=3532
-      ICEmbeddingDate=4246 (2014-09-03)
-      ICPrePersonalizer=4A31
-      ICPrePersonalizationEquipmentDate=3031 (2013-01-31)
-      ICPrePersonalizationEquipmentID=38393132
-      ICPersonalizer=0600
-      ICPersonalizationDate=0123 (2010-05-03)
-      ICPersonalizationEquipmentID=B148EF84
-
-IIN: 420100
-CIN: 45080000000000000000
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.1.1
--> GP Version: 2.1.1
-Tag 63: 1.2.840.114283.3
-Tag 64: 1.2.840.114283.4.2.85
--> GP SCP02 i=55
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
+-> GP card is uniquely identified by the Issuer Identification Number (IIN) and Card Image Number (CIN)
+Tag 6: 1.2.840.114283.4.2.85
+-> GP SCP02 (i=55)
+Tag 66: 1.3.6.1.4.1.42.2.110.1.16
 Card Capabilities: 
-Supports: SCP02 i=55
-Supports: SCP03 i=00 i=10 with AES-128 AES-196 AES-256
-Supported DOM privileges: SecurityDomain, CardLock, CardTerminate, CardReset, CVMManagement, TrustedPath, AuthorizedManagement, TokenVerification, GlobalDelete, GlobalLock, GlobalRegistry, FinalApplication, ReceiptGeneration
-Supported APP privileges: CardLock, CardTerminate, CardReset, CVMManagement, FinalApplication, GlobalService
-Supported LFDB hash: 02
-Supported Token Verification ciphers: 01020840
-Supported Receipt Generation ciphers: 0408
-Supported DAP Verification ciphers: 01020840
-Supported ECC Key Parameters: 0102030405
-Version: 255 (0xFF) ID:   1 (0x01) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   2 (0x02) type: DES3 length:  16 
-Version: 255 (0xFF) ID:   3 (0x03) type: DES3 length:  16 
-Key version suggests factory keys
+```
 
 
------------------------------------------------------------------------------------------------------------
+# ACS
 
-C1 (ACS ACOSJ 40k)
+## C1
 
-Card ATR: 3B 89 80 01 41 43 4F 53 4A 76 32 30 34 1C
+**Name**: ACS ACOSJ 40k
+**Card ATR**: `3B 89 80 01 41 43 4F 53 4A 76 32 30 34 1C`
 
+```
 KDD: CF0A00000265018303953662
 SSC: C1020005
 Card Data: 
@@ -690,14 +717,16 @@ Card Capabilities:
 Version:  32 (0x20) ID:   1 (0x01) type: DES3         length:  16
 Version:  32 (0x20) ID:   2 (0x02) type: DES3         length:  16
 Version:  32 (0x20) ID:   3 (0x03) type: DES3         length:  16
+```
 
+# Gemalto
 
------------------------------------------------------------------------------------------------------------
-
-E1 (Gemalto IDClassic 230) same as E2 likely
+## E1
 
-Card ATR: 3B 95 95 40 FF AE 01 03 00 00
+**Name**: Gemalto IDClassic 230
+**Card ATR**: `3B 95 95 40 FF AE 01 03 00 00`
 
+```
 CPLC: ICFabricator=4090
       ICType=6145
       OperatingSystemID=2041
@@ -726,13 +755,13 @@ Card Data:
 Card Capabilities: 
 [WARN] GPData - GET DATA(Card Capabilities) not supported
 [WARN] GPData - GET DATA(Key Info Template) not supported
+```
 
------------------------------------------------------------------------------------------------------------
-
-E2 (Gemalto IDClassic 230) same as E1 likely
-
-Card ATR: 3B 95 95 40 FF AE 01 03 00 00
+## E2
+**Name**: Gemalto IDClassic 230
+**Card ATR**: 3B 95 95 40 FF AE 01 03 00 00
 
+```
 CPLC: ICFabricator=4090
       ICType=6145
       OperatingSystemID=2041
@@ -761,56 +790,16 @@ Card Data:
 Card Capabilities: 
 [WARN] GPData - GET DATA(Card Capabilities) not supported
 [WARN] GPData - GET DATA(Key Info Template) not supported
+```
 
------------------------------------------------------------------------------------------------------------
-
-G2 (G&D Smartcafe 6.0)
+# Oberthur
 
-Card ATR: 3B FE 18 00 00 80 31 FE 45 53 43 45 36 30 2D 43 44 30 38 31 2D 6E 46 A9
+## O1 
 
-CPLC: ICFabricator=4790
-      ICType=5037
-      OperatingSystemID=1671
-      OperatingSystemReleaseDate=1146 (2021-05-26)
-      OperatingSystemReleaseLevel=4003
-      ICFabricationDate=5024 (2025-01-24)
-      ICSerialNumber=970069A3
-      ICBatchIdentifier=7271
-      ICModuleFabricator=4792
-      ICModulePackagingDate=0144 (2020-05-23)
-      ICCManufacturer=1673
-      ICEmbeddingDate=0283 (2020-10-09)
-      ICPrePersonalizer=1674
-      ICPrePersonalizationEquipmentDate=5092 (2015-04-02)
-      ICPrePersonalizationEquipmentID=00000A01
-      ICPersonalizer=0000
-      ICPersonalizationDate=0000 (invalid date format)
-      ICPersonalizationEquipmentID=00000000
-
-KDD: CF0A00005024970069A37271
-SSC: C1020000
-Card Data: 
-Tag 6: 1.2.840.114283.1
--> Global Platform card
-Tag 60: 1.2.840.114283.2.2.1.1
--> GP Version: 2.1.1
-Tag 63: 1.2.840.114283.3
--> GP card is uniquely identified by the Issuer Identification Number (IIN) and Card Image Number (CIN)
-Tag 6: 1.2.840.114283.4.3.0
--> GP SCP03
-Tag 66: 1.3.6.1.4.1.42.2.110.1.2
--> JavaCard v2
-Card Capabilities: 
-Version:   1 (0x01) ID:   1 (0x01) type: DES3         length:  16
-Version:   1 (0x01) ID:   2 (0x02) type: DES3         length:  16
-Version:   1 (0x01) ID:   3 (0x03) type: DES3         length:  16
-
------------------------------------------------------------------------------------------------------------
-
-O1 (Oberthur ID-One Cosmo 64)
-
-Card ATR: 3B 7B 18 00 00 00 31 C0 64 77 E9 10 00 01 90 00
+**Name**: Oberthur ID-One Cosmo 64
+**Card ATR**: `3B 7B 18 00 00 00 31 C0 64 77 E9 10 00 01 90 00`
 
+```
 CPLC: ICFabricator=2050
       ICType=5000
       OperatingSystemID=4041
@@ -841,13 +830,14 @@ Tag 6: 1.2.840.114283.4.1.5
 -> GP SCP01 (i=05)
 Card Capabilities: 
 Version: 255 (0xFF) ID:   1 (0x01) type: DES3_RESERVED length:  16 (factory key)
+```
 
------------------------------------------------------------------------------------------------------------
-
-O2 (Oberthur Cosmo Dual 72)
+## O2
 
-Card ATR: 3B 7B 18 00 00 00 31 C0 64 77 E3 03 00 82 90 00
+**Name**: Oberthur Cosmo Dual 72
+**Card ATR**: `3B 7B 18 00 00 00 31 C0 64 77 E3 03 00 82 90 00`
 
+```
 CPLC: ICFabricator=2050
       ICType=5000
       OperatingSystemID=4041
@@ -879,3 +869,4 @@ Tag 6: 1.2.840.114283.4.1.5
 -> GP SCP01 (i=05)
 Card Capabilities: 
 Version: 255 (0xFF) ID:   1 (0x01) type: DES3         length:  16 (factory key)
+```
diff --git a/analysis/countermeasures/README.md b/analysis/countermeasures/README.md
index 058725c..0f29f54 100644
--- a/analysis/countermeasures/README.md
+++ b/analysis/countermeasures/README.md
@@ -56,6 +56,10 @@ are described in the [main README](../../README.md) in section **Setup**. Please
 steps to build ECTester components. Note that, the standalone tool has additional setup instructions
 in the README.
 
+Optionally, you can download pre-built versions of the applet and reader tool from our CI
+or releases. However, the standalone tool is dependent on the ECC library versions it targets and thus
+a version built in CI may be useless/not work for you.
+
 
 ### Python
 
@@ -86,14 +90,14 @@ data collection for our tests.
 3. You can run our results evaluation that takes in either our provided results
 from smartcards or those you produced in the previous step.
 4. You can "play around" with the standalone tool and observe test results
-on software ECC libraries.
+on ECC libraries.
 
 See subsections below for more details.
 
 
 ### Simulation
 
-> This step supports *section 6* of the paper, mainly Table 4.
+> This step supports *Section 6* of the paper, mainly Table 4.
 
 1. Run the `simulation.ipynb` notebook.
 2. Examine the test results and how they correspond to Table 4.
@@ -101,22 +105,33 @@ See subsections below for more details.
 
 ### Measurement on JavaCards
 
-> This step supports *subsection 6.6* of the paper.
+> This step supports *Subsection 6.6* of the paper.
 
 Note that, this step is not necessary, is time consuming and requires access
 to suitable JavaCard smartcards (which it may permanently destroy).
 
-1. Build applet for correct platform version.
+1. Build applet for correct platform version:
 2. Install applet (e.g. gp-pro)
-3. Run measure notebook.
+3. Run `measure.ipynb` notebook.
+
 
 ### Evalution of results
--> (Subsection 6.6)
 
-1. Run results notebook.
+> This step supports *Subsection 6.6* of the paper, mainly Table 5.
+
+1. Run `results.ipynb` notebook on chosen card results.
+2. Examine how the results correspond to Table 5.
+
 
 ### Playing around with libraries
--> (Section 5)
+
+> This step supports (part of) *Section 5* of the paper.
+
+Our analysis of ECC libraries and its results in Section 5 of the paper
+required manual effort in evaluating and understanding the results provided
+by the test-suites. Thus, we do not provide a script or a guide here, merely
+point towards the standalone tool and its documentation in the main README.
+
 
 ## Cards