Changed outdated "STARCOS SPK 2.3" name to "STARCOS".
modified: src/libopensc/pkcs15-infocamere.c modified: src/libopensc/pkcs15-starcert.c modified: src/pkcs15init/pkcs15-lib.c Changed isf_acl to also need SO PIN for CREATE. modified: src/pkcs15init/starcos.profile
This commit is contained in:
parent
496a9b571d
commit
551fcccb90
|
@ -787,7 +787,7 @@ static int infocamere_detect_card(sc_pkcs15_card_t * p15card)
|
|||
sc_card_t *card = p15card->card;
|
||||
|
||||
/* check if we have the correct card OS */
|
||||
if (strcmp(card->name, "STARCOS SPK 2.3")
|
||||
if (strcmp(card->name, "STARCOS")
|
||||
&& strcmp(card->name, "CardOS M4"))
|
||||
return SC_ERROR_WRONG_CARD;
|
||||
return SC_SUCCESS;
|
||||
|
|
|
@ -106,7 +106,7 @@ static int starcert_detect_card(sc_pkcs15_card_t *p15card)
|
|||
sc_card_t *card = p15card->card;
|
||||
|
||||
/* check if we have the correct card OS */
|
||||
if (strcmp(card->name, "STARCOS SPK 2.3"))
|
||||
if (strcmp(card->name, "STARCOS"))
|
||||
return SC_ERROR_WRONG_CARD;
|
||||
/* read EF_Info file */
|
||||
sc_format_path("3F00FE13", &path);
|
||||
|
|
|
@ -3893,7 +3893,7 @@ do_select_parent(struct sc_profile *profile, struct sc_pkcs15_card *p15card,
|
|||
r = sc_select_file(p15card->card, &path, NULL);
|
||||
LOG_TEST_RET(ctx, r, "Cannot select parent DF");
|
||||
}
|
||||
else if (r == SC_SUCCESS && !strcmp(p15card->card->name, "STARCOS SPK 2.3")) {
|
||||
else if (r == SC_SUCCESS && !strcmp(p15card->card->name, "STARCOS")) {
|
||||
/* in case of starcos spk 2.3 SELECT FILE does not
|
||||
* give us the ACLs => ask the profile */
|
||||
sc_file_free(*parent);
|
||||
|
|
|
@ -10,7 +10,7 @@ cardinfo {
|
|||
option default {
|
||||
macros {
|
||||
so-pin-flags = initialized, needs-padding, soPin;
|
||||
isf_acl = WRITE=$SOPIN;
|
||||
isf_acl = WRITE=$SOPIN, CREATE=$SOPIN;
|
||||
df_acl = *=$SOPIN;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue