oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(p11_list_keys): fetch CKA_LABEL and use it to set the friendlyname

Browse Source 
for the certificate.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18033 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-06 09:26:43 +00:00
parent 30a95d7add
commit 36d0c4e85a
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/hx509/ks_p11.c
View File

@@ -683,14 +683,17 @@ collect_cert(struct p11_module *p, struct p11_slot *slot,
CK_OBJECT_HANDLE object, CK_OBJECT_HANDLE object,
void *ptr, CK_ATTRIBUTE *query, int num_query) void *ptr, CK_ATTRIBUTE *query, int num_query)
{ {
heim_octet_string localKeyId;
struct p11_collector *ctx = ptr; struct p11_collector *ctx = ptr;
hx509_cert cert; hx509_cert cert;
Certificate t; Certificate t;
int ret; int ret;
localKeyId.data = query[0].pValue; if ((CK_LONG)query[0].ulValueLen == -1 ||
localKeyId.length = query[0].ulValueLen; (CK_LONG)query[1].ulValueLen == -1)
{
return 0;
}
ret = decode_Certificate(query[1].pValue, query[1].ulValueLen, ret = decode_Certificate(query[1].pValue, query[1].ulValueLen,
&t, NULL); &t, NULL);
@@ -708,11 +711,27 @@ collect_cert(struct p11_module *p, struct p11_slot *slot,
_hx509_cert_set_release(cert, p11_cert_release, p); _hx509_cert_set_release(cert, p11_cert_release, p);
{
heim_octet_string data;
data.data = query[0].pValue;
data.length = query[0].ulValueLen;
_hx509_set_cert_attribute(ctx->context,
cert,
oid_id_pkcs_9_at_localKeyId(),
&data);
}
_hx509_set_cert_attribute(ctx->context, if ((CK_LONG)query[2].ulValueLen != -1) {
cert, char *str;
oid_id_pkcs_9_at_localKeyId(),
&localKeyId); asprintf(&str, "%.*s", (int)query[2].ulValueLen, query[2].pValue);
if (str) {
hx509_cert_set_friendly_name(cert, str);
free(str);
}
}
ret = _hx509_collector_certs_add(ctx->context, ctx->c, cert); ret = _hx509_collector_certs_add(ctx->context, ctx->c, cert);
if (ret) { if (ret) {
@@ -737,9 +756,10 @@ p11_list_keys(hx509_context context,
CK_ATTRIBUTE search_data[] = { CK_ATTRIBUTE search_data[] = {
{CKA_CLASS, &key_class, sizeof(key_class)}, {CKA_CLASS, &key_class, sizeof(key_class)},
}; };
CK_ATTRIBUTE query_data[2] = { CK_ATTRIBUTE query_data[3] = {
{CKA_ID, NULL, 0}, {CKA_ID, NULL, 0},
{CKA_VALUE, NULL, 0} {CKA_VALUE, NULL, 0},
{CKA_LABEL, NULL, 0}
}; };
int ret; int ret;
@@ -763,7 +783,7 @@ p11_list_keys(hx509_context context,
key_class = CKO_CERTIFICATE; key_class = CKO_CERTIFICATE;
ret = iterate_entries(p, slot, session, ret = iterate_entries(p, slot, session,
search_data, 1, search_data, 1,
query_data, 2, query_data, 3,
collect_cert, &ctx); collect_cert, &ctx);
if (ret) if (ret)
goto out; goto out;