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

Support PINs to login to the store.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22460 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-01-15 22:08:07 +00:00
parent 781d1c3f15
commit e84294788e
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/hx509/softp11.c
View File

@@ -369,6 +369,8 @@ add_pubkey_info(hx509_context hxctx, struct st_object *o,
if (key_type != CKK_RSA) if (key_type != CKK_RSA)
return CKR_OK; return CKR_OK;
if (_hx509_cert_private_key(cert) == NULL)
return CKR_OK;
num = _hx509_private_key_get_internal(context, num = _hx509_private_key_get_internal(context,
_hx509_cert_private_key(cert), _hx509_cert_private_key(cert),
@@ -600,14 +602,26 @@ add_certificate(const char *cert_file,
char *id, char *id,
char *label) char *label)
{ {
int ret;
hx509_certs certs; hx509_certs certs;
hx509_lock lock = NULL;
int ret;
struct foo foo; struct foo foo;
foo.id = id; foo.id = id;
foo.label = label; foo.label = label;
ret = hx509_certs_init(context, cert_file, 0, NULL, &certs); if (pin) {
char *str;
asprintf(&str, "PASS:%s", pin);
hx509_lock_init(context, &lock);
hx509_lock_command_string(lock, str);
memset(str, 0, strlen(str));
free(str);
}
ret = hx509_certs_init(context, cert_file, 0, lock, &certs);
if (ret) { if (ret) {
st_logf("failed to open file %s\n", cert_file); st_logf("failed to open file %s\n", cert_file);
return CKR_GENERAL_ERROR; return CKR_GENERAL_ERROR;
@@ -835,9 +849,15 @@ C_Initialize(CK_VOID_PTR a)
soft_token.config_file = fn; soft_token.config_file = fn;
} }
#if 0
/*
* XXX this should really fail if the password is missing and the
* cert-store is protected by a password
*/
ret = read_conf_file(soft_token.config_file, CKU_USER, NULL); ret = read_conf_file(soft_token.config_file, CKU_USER, NULL);
if (ret == CKR_OK) if (ret == CKR_OK)
soft_token.flags.login_done = 1; soft_token.flags.login_done = 1;
#endif
return CKR_OK; return CKR_OK;
} }