From 066fdce95a3a58e312f52c4e14536b4b3a4f5e26 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 9 May 2017 16:46:16 +0200 Subject: [PATCH 1/3] If the underlying PKCS#15 structure does not provide label for a certificate, try to use DN from the certificate. --- src/libopensc/libopensc.exports | 1 + src/pkcs11/framework-pkcs15.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/libopensc/libopensc.exports b/src/libopensc/libopensc.exports index 18f80374f..36cf57023 100644 --- a/src/libopensc/libopensc.exports +++ b/src/libopensc/libopensc.exports @@ -208,6 +208,7 @@ sc_pkcs15_free_prkey_info sc_pkcs15_free_pubkey sc_pkcs15_free_pubkey_info sc_pkcs15_get_application_by_type +sc_pkcs15_get_name_from_dn sc_pkcs15_get_object_guid sc_pkcs15_get_object_id sc_pkcs15_get_objects diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index 42c509356..f9063c8cc 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -553,6 +553,30 @@ public_key_created(struct pkcs15_fw_data *fw_data, const struct sc_pkcs15_id *id return SC_ERROR_OBJECT_NOT_FOUND; } +static void +pkcs15_cert_extract_label(struct pkcs15_cert_object *cert) +{ + if (!cert || !cert->cert_p15obj || !cert->cert_data) + return; + + sc_log(context, "pkcs15_cert_extract_label() called. Current label: %s", cert->cert_p15obj->label); + + /* if we didn't get a label, set one based on the CN */ + if (*cert->cert_p15obj->label == '\0') { /* can't be NULL -- static array */ + static const struct sc_object_id cn_oid = {{ 2, 5, 4, 3, -1 }}; + u8 *cn_name = NULL; + size_t cn_len = 0; + int rv = sc_pkcs15_get_name_from_dn(context, + cert->cert_data->subject, cert->cert_data->subject_len, + &cn_oid, &cn_name, &cn_len); + sc_log(context, "pkcs15_cert_extract_label(): Name from DN is %s", cn_name); + if (rv == SC_SUCCESS) { + memcpy(cert->cert_p15obj->label, cn_name, cn_len); + cert->cert_p15obj->label[cn_len] = '\0'; + } + free(cn_name); + } +} static int __pkcs15_create_cert_object(struct pkcs15_fw_data *fw_data, struct sc_pkcs15_object *cert, @@ -606,6 +627,9 @@ __pkcs15_create_cert_object(struct pkcs15_fw_data *fw_data, struct sc_pkcs15_obj obj2->pub_genfrom = object; object->cert_pubkey = obj2; + /* Find missing labels for certificate */ + pkcs15_cert_extract_label(object); + if (cert_object != NULL) *cert_object = (struct pkcs15_any_object *) object; @@ -877,6 +901,9 @@ check_cert_data_read(struct pkcs15_fw_data *fw_data, struct pkcs15_cert_object * if (!obj2->pub_data) rv = sc_pkcs15_pubkey_from_cert(context, &cert->cert_data->data, &obj2->pub_data); + /* Find missing labels for certificate */ + pkcs15_cert_extract_label(cert); + /* now that we have the cert and pub key, lets see if we can bind anything else */ pkcs15_bind_related_objects(fw_data); @@ -3165,6 +3192,10 @@ pkcs15_cert_get_attribute(struct sc_pkcs11_session *session, void *object, CK_AT *(CK_BBOOL*)attr->pValue = FALSE; break; case CKA_LABEL: + if (check_cert_data_read(fw_data, cert) != 0) { + attr->ulValueLen = 0; + return CKR_OK; + } len = strnlen(cert->cert_p15obj->label, sizeof cert->cert_p15obj->label); check_attribute_buffer(attr, len); memcpy(attr->pValue, cert->cert_p15obj->label, len); From 4d8b75c1f0a901d661ed00b29175e2fdaee940ca Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 19 May 2017 17:52:09 +0200 Subject: [PATCH 2/3] Properly check bounds for long DNs --- src/pkcs11/framework-pkcs15.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index f9063c8cc..863ad02a1 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -566,8 +566,9 @@ pkcs15_cert_extract_label(struct pkcs15_cert_object *cert) int rv = sc_pkcs15_get_name_from_dn(context, cert->cert_data->subject, cert->cert_data->subject_len, &cn_oid, &cn_name, &cn_len); - sc_log(context, "pkcs15_cert_extract_label(): Name from DN is %s", cn_name); if (rv == SC_SUCCESS) { + sc_log(context, "pkcs15_cert_extract_label(): Name from DN is %s", cn_name); + cn_len = MIN(cn_len, SC_PKCS15_MAX_LABEL_SIZE-1); memcpy(cert->cert_p15obj->label, cn_name, cn_len); cert->cert_p15obj->label[cn_len] = '\0'; } From 4621251bbff5cc1df826aa7fdc2aa7dfbae3c8ab Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 22 May 2017 09:46:56 +0200 Subject: [PATCH 3/3] Missing include --- src/pkcs11/framework-pkcs15.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index 863ad02a1..ce890b7a1 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -22,6 +22,7 @@ #include #include #include "libopensc/log.h" +#include "libopensc/internal.h" #include "libopensc/asn1.h" #include "libopensc/cardctl.h" #include "common/compat_strnlen.h"