CVS commit: src/crypto/dist/heimdal/lib/hx509
Module Name:src
Committed By: joerg
Date: Tue Dec 7 22:08:27 UTC 2010
Modified Files:
src/crypto/dist/heimdal/lib/hx509: ks_p11.c
Log Message:
Remove useless conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/lib/hx509/ks_p11.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/hx509/ks_p11.c
diff -u src/crypto/dist/heimdal/lib/hx509/ks_p11.c:1.1 src/crypto/dist/heimdal/lib/hx509/ks_p11.c:1.2
--- src/crypto/dist/heimdal/lib/hx509/ks_p11.c:1.1 Sat Mar 22 09:42:41 2008
+++ src/crypto/dist/heimdal/lib/hx509/ks_p11.c Tue Dec 7 22:08:27 2010
@@ -33,7 +33,7 @@
#include "hx_locl.h"
__RCSID("$Heimdal: ks_p11.c 22071 2007-11-14 20:04:50Z lha $"
-"$NetBSD: ks_p11.c,v 1.1 2008/03/22 09:42:41 mlelstv Exp $");
+"$NetBSD: ks_p11.c,v 1.2 2010/12/07 22:08:27 joerg Exp $");
#ifdef HAVE_DLFCN_H
#include
#endif
@@ -944,11 +944,7 @@
if (p->slot[i].flags & P11_SESSION_IN_USE)
_hx509_abort("pkcs11 module release while session in use");
if (p->slot[i].flags & P11_SESSION) {
- int ret;
-
- ret = P11FUNC(p, CloseSession, (p->slot[i].session));
- if (ret != CKR_OK)
- ;
+ P11FUNC(p, CloseSession, (p->slot[i].session));
}
if (p->slot[i].name)
CVS commit: src/crypto/dist/heimdal/lib/hx509
Module Name:src
Committed By: christos
Date: Fri Apr 2 15:26:17 UTC 2010
Modified Files:
src/crypto/dist/heimdal/lib/hx509: revoke.c
Log Message:
handle ctime returning NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/lib/hx509/revoke.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/hx509/revoke.c
diff -u src/crypto/dist/heimdal/lib/hx509/revoke.c:1.1 src/crypto/dist/heimdal/lib/hx509/revoke.c:1.2
--- src/crypto/dist/heimdal/lib/hx509/revoke.c:1.1 Sat Mar 22 05:42:41 2008
+++ src/crypto/dist/heimdal/lib/hx509/revoke.c Fri Apr 2 11:26:17 2010
@@ -51,7 +51,7 @@
#include "hx_locl.h"
__RCSID("$Heimdal: revoke.c 22275 2007-12-11 11:02:11Z lha $"
-"$NetBSD: revoke.c,v 1.1 2008/03/22 09:42:41 mlelstv Exp $");
+"$NetBSD: revoke.c,v 1.2 2010/04/02 15:26:17 christos Exp $");
struct revoke_crl {
char *path;
@@ -1049,8 +1049,13 @@
printable_time(time_t t)
{
static char s[128];
-strlcpy(s, ctime(&t)+ 4, sizeof(s));
-s[20] = 0;
+char *p;
+if ((p = ctime(&t)) == NULL)
+ strlcpy(s, "?", sizeof(s));
+else {
+ strlcpy(s, p + 4, sizeof(s));
+ s[20] = 0;
+}
return s;
}
CVS commit: src/crypto/dist/heimdal/lib/hx509
Module Name:src
Committed By: apb
Date: Tue Jul 14 20:54:25 UTC 2009
Modified Files:
src/crypto/dist/heimdal/lib/hx509: softp11.c
Log Message:
Add missing va_start before varargs processing.
Part of PR 41255 from Kurt Lidl.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/lib/hx509/softp11.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/hx509/softp11.c
diff -u src/crypto/dist/heimdal/lib/hx509/softp11.c:1.1 src/crypto/dist/heimdal/lib/hx509/softp11.c:1.2
--- src/crypto/dist/heimdal/lib/hx509/softp11.c:1.1 Sat Mar 22 09:42:41 2008
+++ src/crypto/dist/heimdal/lib/hx509/softp11.c Tue Jul 14 20:54:25 2009
@@ -127,6 +127,7 @@
{
int len;
va_list ap;
+va_start(ap, fmt);
len = vsnprintf(str, size, fmt, ap);
va_end(ap);
if (len < 0 || len > size)
