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

Partly assign private key, enough to complete collection, but not

Browse Source 
any crypto functionallity.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16457 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-04 03:14:59 +00:00
parent 971cfe76fa
commit 33038f7586
1 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/hx509/ks_p11.c
View File

@@ -36,6 +36,7 @@ RCSID("$Id$");
#include <dlfcn.h> #include <dlfcn.h>
#include <openssl/ui.h> #include <openssl/ui.h>
#include <openssl/rsa.h>
#include "pkcs11u.h" #include "pkcs11u.h"
#include "pkcs11.h" #include "pkcs11.h"
@@ -244,26 +245,63 @@ print_id(void *ptr, CK_ATTRIBUTE *query, int num_query)
return 0; return 0;
} }
static int
collect_private_key(void *ptr, CK_ATTRIBUTE *query, int num_query)
{
struct hx509_collector *c = ptr;
AlgorithmIdentifier alg;
hx509_private_key key;
heim_octet_string localKeyId;
int ret;
memset(&alg, 0, sizeof(alg));
localKeyId.data = query[0].pValue;
localKeyId.length = query[0].ulValueLen;
ret = _hx509_new_private_key(&key);
if (ret)
return ret;
ret = _hx509_collector_private_key_add(c,
&alg,
key,
NULL,
&localKeyId);
if (ret) {
_hx509_free_private_key(&key);
return ret;
}
return 0;
}
static int static int
collect_cert(void *ptr, CK_ATTRIBUTE *query, int num_query) collect_cert(void *ptr, CK_ATTRIBUTE *query, int num_query)
{ {
heim_octet_string localKeyId;
struct hx509_collector *c = ptr; struct hx509_collector *c = ptr;
hx509_cert cert; hx509_cert cert;
Certificate t; Certificate t;
int ret; int ret;
localKeyId.data = query[0].pValue;
localKeyId.length = query[0].ulValueLen;
ret = decode_Certificate(query[1].pValue, query[1].ulValueLen, ret = decode_Certificate(query[1].pValue, query[1].ulValueLen,
&t, NULL); &t, NULL);
if (ret) { if (ret)
printf("decode_Certificate failed with %d\n", ret);
return 0; return 0;
}
ret = hx509_cert_init(&t, &cert); ret = hx509_cert_init(&t, &cert);
free_Certificate(&t); free_Certificate(&t);
if (ret) if (ret)
return ret; return ret;
_hx509_set_cert_attribute(cert,
oid_id_pkcs_9_at_localKeyId(),
&localKeyId);
ret = _hx509_collector_certs_add(c, cert); ret = _hx509_collector_certs_add(c, cert);
if (ret) { if (ret) {
hx509_cert_free(cert); hx509_cert_free(cert);
@@ -303,7 +341,7 @@ p11_list_keys(struct p11_module *p,
ret = iterate_entries(p, slot, ret = iterate_entries(p, slot,
search_data, 1, search_data, 1,
query_data, 1, query_data, 1,
print_id, c); collect_private_key, c);
if (ret) { if (ret) {
return ret; return ret;
} }