Remove obsolete FinEID cards

Since 2017-01-01 issued cards are Gemalto MultiApp

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

Author: metsma

src/libopensc/card-setcos.c

@@ -31,31 +31,11 @@
 #include "asn1.h"
 #include "cardctl.h"
 
-#define _FINEID_BROKEN_SELECT_FLAG 1
-
 static const struct sc_atr_table setcos_atrs[] = {
 	/* some Nokia branded SC */
 	{ "3B:1F:11:00:67:80:42:46:49:53:45:10:52:66:FF:81:90:00", NULL, NULL, SC_CARD_TYPE_SETCOS_GENERIC, 0, NULL },
 	/* RSA SecurID 3100 */
 	{ "3B:9F:94:40:1E:00:67:16:43:46:49:53:45:10:52:66:FF:81:90:00", NULL, NULL, SC_CARD_TYPE_SETCOS_PKI, 0, NULL },
-
-	/* FINEID 1016 (SetCOS 4.3.1B3/PKCS#15, VRK) */
-	{ "3b:9f:94:40:1e:00:67:00:43:46:49:53:45:10:52:66:ff:81:90:00", "ff:ff:ff:ff:ff:ff:ff:00:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff", NULL, SC_CARD_TYPE_SETCOS_FINEID, SC_CARD_FLAG_RNG, NULL },
-	/* FINEID 2032 (EIDApplet/7816-15, VRK test) */
-	{ "3b:6b:00:ff:80:62:00:a2:56:46:69:6e:45:49:44", "ff:ff:00:ff:ff:ff:00:ff:ff:ff:ff:ff:ff:ff:ff", NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	/* FINEID 2132 (EIDApplet/7816-15, 3rdparty test) */
-	{ "3b:64:00:ff:80:62:00:a2", "ff:ff:00:ff:ff:ff:00:ff", NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	/* FINEID 2064 (EIDApplet/7816-15, VRK) */
-	{ "3b:7b:00:00:00:80:62:00:51:56:46:69:6e:45:49:44", "ff:ff:00:ff:ff:ff:ff:f0:ff:ff:ff:ff:ff:ff:ff:ff", NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	/* FINEID 2164 (EIDApplet/7816-15, 3rdparty) */
-	{ "3b:64:00:00:80:62:00:51", "ff:ff:ff:ff:ff:ff:f0:ff", NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	/* FINEID 2264 (EIDApplet/7816-15, OPK/EMV/AVANT) */
-	{ "3b:6e:00:00:00:62:00:00:57:41:56:41:4e:54:10:81:90:00", NULL, NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	{ "3b:7b:94:00:00:80:62:11:51:56:46:69:6e:45:49:44", NULL, NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, 0, NULL },
-	/* FINEID cards 1.3.2011 with Samsung chips (round connector) that supports 2048 bit keys. */
-	{ "3b:7b:94:00:00:80:62:12:51:56:46:69:6e:45:49:44", NULL, NULL, SC_CARD_TYPE_SETCOS_FINEID_V2_2048, 0, NULL },
-	/* FINEID card for organisations, chip unknown. */
-	{ "3b:7b:18:00:00:80:62:01:54:56:46:69:6e:45:49:44", NULL, NULL, SC_CARD_TYPE_SETCOS_FINEID_V2, _FINEID_BROKEN_SELECT_FLAG, NULL },
 	/* Swedish NIDEL card */
 	{ "3b:9f:94:80:1f:c3:00:68:10:44:05:01:46:49:53:45:31:c8:07:90:00:18", NULL, NULL, SC_CARD_TYPE_SETCOS_NIDEL, 0, NULL },
 	/* Setcos 4.4.1 */
@@ -107,11 +87,6 @@ static int setcos_match_card(sc_card_t *card)
 
 	i = _sc_match_atr(card, setcos_atrs, &card->type);
 	if (i < 0) {
-		/* Unknown card, but has the FinEID application for sure */
-		if (match_hist_bytes(card, "FinEID", 0)) {
-			card->type = SC_CARD_TYPE_SETCOS_FINEID_V2_2048;
-			return 1;
-		}
 		if (match_hist_bytes(card, "FISE", 0)) {
 			card->type = SC_CARD_TYPE_SETCOS_GENERIC;
 			return 1;
@@ -164,8 +139,6 @@ static int setcos_init(sc_card_t *card)
 	}
 
 	switch (card->type) {
-	case SC_CARD_TYPE_SETCOS_FINEID:
-	case SC_CARD_TYPE_SETCOS_FINEID_V2_2048:
 	case SC_CARD_TYPE_SETCOS_NIDEL:
 		card->cla = 0x00;
 		select_pkcs15_app(card);
@@ -190,7 +163,6 @@ static int setcos_init(sc_card_t *card)
 
 	switch (card->type) {
 	case SC_CARD_TYPE_SETCOS_PKI:
-	case SC_CARD_TYPE_SETCOS_FINEID_V2_2048:
 		{
 			unsigned long flags;
 
@@ -593,9 +565,7 @@ static int setcos_set_security_env2(sc_card_t *card,
 		break;
 	case SC_SEC_OPERATION_SIGN:
 		/* Should be 0x41 */
-		apdu.p1 = ((card->type == SC_CARD_TYPE_SETCOS_FINEID_V2) ||
-		           (card->type == SC_CARD_TYPE_SETCOS_FINEID_V2_2048) ||
-		           (card->type == SC_CARD_TYPE_SETCOS_44) ||
+		apdu.p1 = ((card->type == SC_CARD_TYPE_SETCOS_44) ||
 			   (card->type == SC_CARD_TYPE_SETCOS_NIDEL) ||
 			   SETCOS_IS_EID_APPLET(card)) ? 0x41 : 0x81;
 		apdu.p2 = 0xB6;
@@ -617,8 +587,7 @@ static int setcos_set_security_env2(sc_card_t *card,
 		p += env->file_ref.len;
 	}
 	if (env->flags & SC_SEC_ENV_KEY_REF_PRESENT &&
-	    !(card->type == SC_CARD_TYPE_SETCOS_NIDEL ||
-	      card->type == SC_CARD_TYPE_SETCOS_FINEID_V2_2048)) {
+	    !(card->type == SC_CARD_TYPE_SETCOS_NIDEL)) {
 		if (env->flags & SC_SEC_ENV_KEY_REF_SYMMETRIC)
 			*p++ = 0x83;
 		else
@@ -679,8 +648,6 @@ static int setcos_set_security_env(sc_card_t *card,
 		}
 		switch (card->type) {
 		case SC_CARD_TYPE_SETCOS_PKI:
-		case SC_CARD_TYPE_SETCOS_FINEID:
-		case SC_CARD_TYPE_SETCOS_FINEID_V2_2048:
 		case SC_CARD_TYPE_SETCOS_NIDEL:
 		case SC_CARD_TYPE_SETCOS_44:
 		case SC_CARD_TYPE_SETCOS_EID_V2_0:
@@ -922,9 +889,6 @@ static int setcos_select_file(sc_card_t *card,
 	int r;
 
 	r = iso_ops->select_file(card, in_path, file);
-	/* Certain FINeID cards for organisations return 6A88 instead of 6A82 for missing files */
-	if (card->flags & _FINEID_BROKEN_SELECT_FLAG && r == SC_ERROR_DATA_OBJECT_NOT_FOUND)
-		return SC_ERROR_FILE_NOT_FOUND;
 	if (r)
 		return r;
 	if (file != NULL) {

src/libopensc/cards.h

@@ -64,10 +64,7 @@ enum {
 	SC_CARD_TYPE_SETCOS_BASE = 6000,
 	SC_CARD_TYPE_SETCOS_GENERIC,
 	SC_CARD_TYPE_SETCOS_PKI,
-	SC_CARD_TYPE_SETCOS_FINEID,
-	SC_CARD_TYPE_SETCOS_FINEID_V2,
 	SC_CARD_TYPE_SETCOS_NIDEL,
-	SC_CARD_TYPE_SETCOS_FINEID_V2_2048,
 	SC_CARD_TYPE_SETCOS_44 = 6100,
 	SC_CARD_TYPE_SETCOS_EID_V2_0,
 	SC_CARD_TYPE_SETCOS_EID_V2_1,