You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
121 lines
4.3 KiB
121 lines
4.3 KiB
From bac1ced89dde5780ecb5014b3887e4fd81c7d81c Mon Sep 17 00:00:00 2001 |
|
From: Jakub Jelen <jjelen@redhat.com> |
|
Date: Fri, 18 Aug 2017 13:49:57 +0200 |
|
Subject: [PATCH 1/3] Use shorter PIN name for default PIN to accomodate Card |
|
Holder name in future |
|
|
|
--- |
|
src/libopensc/pkcs15-piv.c | 4 ++-- |
|
1 file changed, 2 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c |
|
index d38d7ba73..7f9015dcc 100644 |
|
--- a/src/libopensc/pkcs15-piv.c |
|
+++ b/src/libopensc/pkcs15-piv.c |
|
@@ -359,7 +359,7 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card) |
|
}; |
|
|
|
static const pindata pins[] = { |
|
- { "01", "PIV Card Holder pin", "", 0x80, |
|
+ { "01", "PIN", "", 0x80, |
|
/* label, flag and ref will change if using global pin */ |
|
SC_PKCS15_PIN_TYPE_ASCII_NUMERIC, |
|
8, 4, 8, |
|
@@ -932,7 +932,7 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card) |
|
pin_info.attrs.pin.reference = pin_ref; |
|
pin_info.attrs.pin.flags &= ~SC_PKCS15_PIN_FLAG_LOCAL; |
|
label = "Global PIN"; |
|
- } |
|
+ } |
|
sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label); |
|
strncpy(pin_obj.label, label, SC_PKCS15_MAX_LABEL_SIZE - 1); |
|
pin_obj.flags = pins[i].obj_flags; |
|
|
|
From 74b070128c27e24aa67db041a049a9eee5dddcd6 Mon Sep 17 00:00:00 2001 |
|
From: Jakub Jelen <jjelen@redhat.com> |
|
Date: Fri, 18 Aug 2017 14:18:00 +0200 |
|
Subject: [PATCH 2/3] Get cardholder name from the first certificate |
|
|
|
--- |
|
src/libopensc/pkcs15-piv.c | 24 +++++++++++++++++++++++- |
|
1 file changed, 23 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c |
|
index 7f9015dcc..6f3c9199d 100644 |
|
--- a/src/libopensc/pkcs15-piv.c |
|
+++ b/src/libopensc/pkcs15-piv.c |
|
@@ -613,7 +613,7 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card) |
|
char buf[SC_MAX_SERIALNR * 2 + 1]; |
|
common_key_info ckis[PIV_NUM_CERTS_AND_KEYS]; |
|
int follows_nist_fascn = 0; |
|
- |
|
+ char *token_name = NULL; |
|
|
|
SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE); |
|
|
|
@@ -765,6 +765,30 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card) |
|
sc_pkcs15_free_certificate(cert_out); |
|
continue; |
|
} |
|
+ |
|
+ /* set the token name to the name of the CN of the first certificate */ |
|
+ if (!token_name) { |
|
+ u8 * cn_name = NULL; |
|
+ size_t cn_len = 0; |
|
+ static const struct sc_object_id cn_oid = {{ 2, 5, 4, 3, -1 }}; |
|
+ r = sc_pkcs15_get_name_from_dn(card->ctx, cert_out->subject, |
|
+ cert_out->subject_len, &cn_oid, &cn_name, &cn_len); |
|
+ if (r == SC_SUCCESS) { |
|
+ token_name = malloc (cn_len+1); |
|
+ if (!token_name) { |
|
+ sc_pkcs15_free_certificate(cert_out); |
|
+ free(cn_name); |
|
+ SC_FUNC_RETURN(card->ctx, |
|
+ SC_ERROR_OUT_OF_MEMORY, r); |
|
+ } |
|
+ memcpy(token_name, cn_name, cn_len); |
|
+ free(cn_name); |
|
+ token_name[cn_len] = 0; |
|
+ free(p15card->tokeninfo->label); |
|
+ p15card->tokeninfo->label = token_name; |
|
+ } |
|
+ } |
|
+ |
|
/* |
|
* get keyUsage if present save in ckis[i] |
|
* Will only use it if this in a non FED issued card |
|
|
|
From 78c2b7b970a8c2d841552926a7f4c386c31abeb8 Mon Sep 17 00:00:00 2001 |
|
From: Jakub Jelen <jjelen@redhat.com> |
|
Date: Mon, 21 Aug 2017 13:43:08 +0200 |
|
Subject: [PATCH 3/3] Do not add non-informative PIN to the token label |
|
|
|
--- |
|
src/pkcs11/framework-pkcs15.c | 4 +++- |
|
1 file changed, 3 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c |
|
index 5b3cb32e5..8ded1125b 100644 |
|
--- a/src/pkcs11/framework-pkcs15.c |
|
+++ b/src/pkcs11/framework-pkcs15.c |
|
@@ -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; |
|
char label[64]; |
|
|
|
+ sc_log(context, "Called"); |
|
pkcs15_init_token_info(p15card, &slot->token_info); |
|
slot->token_info.flags |= CKF_TOKEN_INITIALIZED; |
|
if (auth != NULL) |
|
@@ -1048,9 +1049,10 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot, |
|
pin_info = NULL; |
|
} |
|
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); |
|
else |
|
+ /* The PIN label is empty or says just non-useful "PIN" */ |
|
snprintf(label, sizeof(label), "%s", p15card->tokeninfo->label); |
|
slot->token_info.flags |= CKF_LOGIN_REQUIRED; |
|
} |
|
|
|
|