Do not add non-informative PIN to the token label
This commit is contained in:
parent
d018855b9f
commit
804f47b298
|
@ -1024,6 +1024,7 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
|
||||||
struct sc_pkcs15_auth_info *pin_info = NULL;
|
struct sc_pkcs15_auth_info *pin_info = NULL;
|
||||||
char label[64];
|
char label[64];
|
||||||
|
|
||||||
|
sc_log(context, "Called");
|
||||||
pkcs15_init_token_info(p15card, &slot->token_info);
|
pkcs15_init_token_info(p15card, &slot->token_info);
|
||||||
slot->token_info.flags |= CKF_TOKEN_INITIALIZED;
|
slot->token_info.flags |= CKF_TOKEN_INITIALIZED;
|
||||||
if (auth != NULL)
|
if (auth != NULL)
|
||||||
|
@ -1048,9 +1049,10 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
|
||||||
pin_info = NULL;
|
pin_info = NULL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (auth->label[0])
|
if (auth->label[0] && strncmp(auth->label, "PIN", 4) != 0)
|
||||||
snprintf(label, sizeof(label), "%.*s (%s)", (int) sizeof auth->label, auth->label, p15card->tokeninfo->label);
|
snprintf(label, sizeof(label), "%.*s (%s)", (int) sizeof auth->label, auth->label, p15card->tokeninfo->label);
|
||||||
else
|
else
|
||||||
|
/* The PIN label is empty or says just non-useful "PIN" */
|
||||||
snprintf(label, sizeof(label), "%s", p15card->tokeninfo->label);
|
snprintf(label, sizeof(label), "%s", p15card->tokeninfo->label);
|
||||||
slot->token_info.flags |= CKF_LOGIN_REQUIRED;
|
slot->token_info.flags |= CKF_LOGIN_REQUIRED;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue