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

sc-hsm: fixed using GoID with unknown ATR

This commit is contained in:
Frank Morgner 2017-05-29 15:04:58 +02:00
parent 3131282760
commit 3e5fc896b7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libopensc/card-sc-hsm.c
View File

@ -64,6 +64,7 @@ static struct sc_atr_table sc_hsm_atrs[] = {
/* standard version */ /* standard version */
{"3B:FE:18:00:00:81:31:FE:45:80:31:81:54:48:53:4D:31:73:80:21:40:81:07:FA", NULL, NULL, SC_CARD_TYPE_SC_HSM, 0, NULL}, {"3B:FE:18:00:00:81:31:FE:45:80:31:81:54:48:53:4D:31:73:80:21:40:81:07:FA", NULL, NULL, SC_CARD_TYPE_SC_HSM, 0, NULL},
{"3B:8E:80:01:80:31:81:54:48:53:4D:31:73:80:21:40:81:07:18", NULL, NULL, SC_CARD_TYPE_SC_HSM, 0, NULL}, {"3B:8E:80:01:80:31:81:54:48:53:4D:31:73:80:21:40:81:07:18", NULL, NULL, SC_CARD_TYPE_SC_HSM, 0, NULL},
{"3B:80:80:01:01", NULL, NULL, SC_CARD_TYPE_SC_HSM_SOC, 0, NULL}, // SoC Sample Card
{ {
"3B:84:80:01:47:6f:49:44:00", "3B:84:80:01:47:6f:49:44:00",
"FF:FF:FF:FF:FF:FF:FF:FF:00", "FF:FF:FF:FF:FF:FF:FF:FF:00",
@ -237,7 +238,8 @@ static int sc_hsm_match_card(struct sc_card *card)
r = sc_hsm_select_file(card, &path, NULL); r = sc_hsm_select_file(card, &path, NULL);
LOG_TEST_RET(card->ctx, r, "Could not select SmartCard-HSM application"); LOG_TEST_RET(card->ctx, r, "Could not select SmartCard-HSM application");
// Select Applet to be sure card->type = SC_CARD_TYPE_SC_HSM;
return 1; return 1;
} }
@ -484,13 +486,11 @@ static int sc_hsm_perform_chip_authentication(sc_card_t *card)
goto err; goto err;
} }
if (card->type == SC_CARD_TYPE_SC_HSM_SOC) { /* XXX on older JCOPs only NID_id_CA_ECDH_3DES_CBC_CBC may be
/* SoC cards are known to be implemented on newer JCOPs */ * supported. The card does not export its capabilities. We hardcode
* NID_id_CA_ECDH_AES_CBC_CMAC_128 here, because we don't have the older
* cards in production. */
protocol = NID_id_CA_ECDH_AES_CBC_CMAC_128; protocol = NID_id_CA_ECDH_AES_CBC_CMAC_128;
} else {
/* Older cards may not support AES accelerator */
protocol = NID_id_CA_ECDH_3DES_CBC_CBC;
}
/* initialize CA domain parameter with the document's public key */ /* initialize CA domain parameter with the document's public key */
if (!EAC_CTX_init_ca(ctx, protocol, 8)) { if (!EAC_CTX_init_ca(ctx, protocol, 8)) {
@ -559,8 +559,9 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
} }
/* For contactless cards always establish a secure channel before PIN /* For contactless cards always establish a secure channel before PIN
* verification */ * verification. Also, Session PIN generation requires SM. */
if (card->type == SC_CARD_TYPE_SC_HSM_SOC if ((card->type == SC_CARD_TYPE_SC_HSM_SOC || card->reader->uid.len
|| cmd == SC_PIN_CMD_GET_SESSION_PIN)
&& (data->cmd != SC_PIN_CMD_GET_INFO) && (data->cmd != SC_PIN_CMD_GET_INFO)
&& card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) { && card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
LOG_TEST_RET(card->ctx, LOG_TEST_RET(card->ctx,