giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Yubico PIV application fixed CI_VERIFY_LC0_FAIL in version 4.3.2 

Also add PIV card types to  sc_pkcs15_is_emulation_only

 On branch piv-aid-discovery

 Changes to be committed:
	modified:   src/libopensc/card-piv.c
	modified:   src/libopensc/pkcs15-syn.c
This commit is contained in:
Doug Engert 2018-01-28 19:15:40 -06:00
parent 1d4f59ea51
commit 8cc0c3911a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libopensc/card-piv.c
View File

@ -3048,7 +3048,7 @@ static int piv_init(sc_card_t *card)
apdu.le = apdu.resplen;
r = sc_transmit_apdu(card, &apdu);
priv->neo_version = (neo_version_buf[0]<<16) | (neo_version_buf[1] <<8) | neo_version_buf[2];
sc_log(card->ctx, "NEO card->type=%d, r=0x%08x version=0x%08x", card->type, r, priv->neo_version);
sc_log(card->ctx, "Yubico card->type=%d, r=0x%08x version=0x%08x", card->type, r, priv->neo_version);
break;
}
@ -3066,16 +3066,18 @@ static int piv_init(sc_card_t *card)
case SC_CARD_TYPE_PIV_II_NEO:
priv->card_issues = CI_NO_EC384
| CI_VERIFY_630X
| CI_VERIFY_LC0_FAIL
| CI_OTHER_AID_LOSE_STATE
| CI_LEAKS_FILE_NOT_FOUND
| CI_NFC_EXPOSE_TOO_MUCH;
if (priv->neo_version < 0x00040302)
priv->card_issues |= CI_VERIFY_LC0_FAIL;
break;
case SC_CARD_TYPE_PIV_II_YUBIKEY4:
priv->card_issues = CI_VERIFY_LC0_FAIL
| CI_OTHER_AID_LOSE_STATE
priv->card_issues = CI_OTHER_AID_LOSE_STATE
| CI_LEAKS_FILE_NOT_FOUND;
if (priv->neo_version < 0x00040302)
priv->card_issues |= CI_VERIFY_LC0_FAIL;
break;
case SC_CARD_TYPE_PIV_II_HIST:
@ -3085,6 +3087,7 @@ static int piv_init(sc_card_t *card)
case SC_CARD_TYPE_PIV_II_GENERIC:
priv->card_issues = CI_VERIFY_LC0_FAIL
| CI_OTHER_AID_LOSE_STATE;
/* TODO may need more research */
break;
default:

5
src/libopensc/pkcs15-syn.c
View File

@ -90,6 +90,11 @@ int sc_pkcs15_is_emulation_only(sc_card_t *card)
case SC_CARD_TYPE_DNIE_USER:
case SC_CARD_TYPE_DNIE_TERMINATED:
case SC_CARD_TYPE_IASECC_GEMALTO:
case SC_CARD_TYPE_PIV_II_GENERIC:
case SC_CARD_TYPE_PIV_II_HIST:
case SC_CARD_TYPE_PIV_II_NEO:
case SC_CARD_TYPE_PIV_II_YUBIKEY4:
return 1;
default:
return 0;