summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--krl.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d663448ea..87fe12d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - djm@cvs.openbsd.org 2013/01/24 21:45:37 3 - djm@cvs.openbsd.org 2013/01/24 21:45:37
4 [krl.c] 4 [krl.c]
5 fix handling of (unused) KRL signatures; skip string in correct buffer 5 fix handling of (unused) KRL signatures; skip string in correct buffer
6 - djm@cvs.openbsd.org 2013/01/24 22:08:56
7 [krl.c]
8 skip serial lookup when cert's serial number is zero
6 9
720130211 1020130211
8 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old 11 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
diff --git a/krl.c b/krl.c
index 8e53f46dc..916852675 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: krl.c,v 1.5 2013/01/24 21:45:37 djm Exp $ */ 17/* $OpenBSD: krl.c,v 1.6 2013/01/24 22:08:56 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -1149,7 +1149,7 @@ is_key_revoked(struct ssh_krl *krl, const Key *key)
1149 } 1149 }
1150 1150
1151 /* Legacy cert formats lack serial numbers */ 1151 /* Legacy cert formats lack serial numbers */
1152 if (key_cert_is_legacy(key)) 1152 if (key_cert_is_legacy(key) || key->cert->serial == buf0)
1153 return 0; 1153 return 0;
1154 1154
1155 bzero(&rs, sizeof(rs)); 1155 bzero(&rs, sizeof(rs));