From 7512386d17cd5efa92dbd43b32e309c011b42a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 17 Jan 2008 11:24:56 +0000 Subject: [PATCH] fix comment, remove label. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22475 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hx509/softp11.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/hx509/softp11.c b/lib/hx509/softp11.c index fdecbd9a8..299fd9ac4 100644 --- a/lib/hx509/softp11.c +++ b/lib/hx509/softp11.c @@ -595,7 +595,6 @@ add_cert(hx509_context hxctx, void *ctx, hx509_cert cert) return 0; } - static CK_RV add_certificate(const char *cert_file, const char *pin, @@ -789,7 +788,7 @@ read_conf_file(const char *fn, CK_USER_TYPE userType, const char *pin) st_logf("unknown type: %s\n", type); } } -out: + fclose(f); return failed; @@ -873,8 +872,8 @@ C_Initialize(CK_VOID_PTR a) } /* - * XXX this should really fail if the password is missing and the - * cert-store is protected by a password + * This operations doesn't return CKR_OK if any of the + * certificates failes to be unparsed (ie password protected). */ ret = read_conf_file(soft_token.config_file, CKU_USER, NULL); if (ret == CKR_OK)