Add FinEID 4.1 support

WE2-1126, WE2-1133

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

src/electronic-id.cpp

@@ -65,18 +65,10 @@ const std::map<byte_vector, ElectronicIDConstructor, VectorComparator> SUPPORTED
     {{0x3b, 0xff, 0x96, 0x00, 0x00, 0x80, 0x31, 0xfe, 0x43, 0x80, 0x31, 0xb8, 0x53,
       0x65, 0x49, 0x44, 0x64, 0xb0, 0x85, 0x05, 0x10, 0x12, 0x23, 0x3f, 0x1d},
      constructor<EstEIDThales>},
-    // FinEID v3.0
-    {{0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31, 0xB8, 0x65, 0xB0,
-      0x85, 0x03, 0x00, 0xEF, 0x12, 0x00, 0xF6, 0x82, 0x90, 0x00},
-     constructor<FinEIDv3>},
     // FinEID v3.1
     {{0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31, 0xB8, 0x65, 0xB0,
       0x85, 0x04, 0x02, 0x1B, 0x12, 0x00, 0xF6, 0x82, 0x90, 0x00},
      constructor<FinEIDv3>},
-    // FinEID v4.0
-    {{0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31, 0xB8, 0x65, 0xB0,
-      0x85, 0x05, 0x00, 0x11, 0x12, 0x24, 0x60, 0x82, 0x90, 0x00},
-     constructor<FinEIDv4>},
     // LatEID Idemia v2.0
     {{0x3b, 0xdb, 0x96, 0x00, 0x80, 0xb1, 0xfe, 0x45, 0x1f, 0x83, 0x00,
       0x12, 0x42, 0x8f, 0x53, 0x65, 0x49, 0x44, 0x0f, 0x90, 0x00, 0x20},
@@ -93,12 +85,6 @@ const std::map<byte_vector, ElectronicIDConstructor, VectorComparator> SUPPORTED
     {{0x3b, 0xff, 0x13, 0x00, 0x00, 0x81, 0x31, 0xfe, 0x45, 0x00, 0x31, 0xb9, 0x64,
       0x04, 0x44, 0xec, 0xc1, 0x73, 0x94, 0x01, 0x80, 0x82, 0x90, 0x00, 0x12},
      constructor<ElectronicID::Type::HrvEID>},
-    // BelEID
-    {{0x3B, 0x98, 0x94, 0x40, 0x0A, 0xA5, 0x03, 0x01, 0x01, 0x01, 0xAD, 0x13, 0x10},
-     constructor<ElectronicID::Type::BelEID>},
-    // BelEID
-    {{0x3B, 0x98, 0x94, 0x40, 0xFF, 0xA5, 0x03, 0x01, 0x01, 0x01, 0xAD, 0x13, 0x10},
-     constructor<ElectronicID::Type::BelEID>},
     // BelEID - https://github.com/Fedict/eid-mw/wiki/Applet-1.8
     {{0x3b, 0x7f, 0x96, 0x00, 0x00, 0x80, 0x31, 0x80, 0x65, 0xb0,
       0x85, 0x04, 0x01, 0x20, 0x12, 0x0f, 0xff, 0x82, 0x90, 0x00},
@@ -137,6 +123,12 @@ struct MaskedATREntry
 };
 
 const std::vector<MaskedATREntry> MASKED_ATRS = {
+    // FinEID Thales v4.0/v4.1
+    {{0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31, 0xB8, 0x65, 0xB0,
+      0x85, 0x05, 0x00, 0x11, 0x12, 0x24, 0x60, 0x82, 0x90, 0x00},
+     {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+      0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+     constructor<FinEIDv4>},
     // BelEID v1.7
     {{0x3b, 0x98, 0x13, 0x40, 0x0a, 0xa5, 0x03, 0x01, 0x01, 0x01, 0xad, 0x13, 0x11},
      {0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00},

tests/mock/atrs.hpp

@@ -31,17 +31,13 @@ const PcscMock::byte_vector ESTEID_IDEMIA_V1_ATR {0x3b, 0xdb, 0x96, 0x00, 0x80,
                                                   0x1f, 0x83, 0x00, 0x12, 0x23, 0x3f, 0x53, 0x65,
                                                   0x49, 0x44, 0x0f, 0x90, 0x00, 0xf1};
 
-const PcscMock::byte_vector LATEID_IDEMIA_V1_ATR {0x3b, 0xdd, 0x18, 0x00, 0x81, 0x31, 0xfe, 0x45,
-                                                  0x90, 0x4c, 0x41, 0x54, 0x56, 0x49, 0x41, 0x2d,
-                                                  0x65, 0x49, 0x44, 0x90, 0x00, 0x8c};
-
 const PcscMock::byte_vector LATEID_IDEMIA_V2_ATR {0x3b, 0xdb, 0x96, 0x00, 0x80, 0xb1, 0xfe, 0x45,
                                                   0x1f, 0x83, 0x00, 0x12, 0x42, 0x8f, 0x53, 0x65,
                                                   0x49, 0x44, 0x0f, 0x90, 0x00, 0x20};
 
-const PcscMock::byte_vector FINEID_V3_ATR {0x3b, 0x7f, 0x96, 0x00, 0x00, 0x80, 0x31,
-                                           0xb8, 0x65, 0xb0, 0x85, 0x03, 0x00, 0xef,
-                                           0x12, 0x00, 0xf6, 0x82, 0x90, 0x00};
+const PcscMock::byte_vector FINEID_V3_ATR {0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31,
+                                           0xB8, 0x65, 0xB0, 0x85, 0x04, 0x02, 0x1B,
+                                           0x12, 0x00, 0xF6, 0x82, 0x90, 0x00};
 
 const PcscMock::byte_vector FINEID_V4_ATR {0x3B, 0x7F, 0x96, 0x00, 0x00, 0x80, 0x31,
                                            0xB8, 0x65, 0xB0, 0x85, 0x05, 0x00, 0x11,