summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-03-06 18:25:12 +0000
committerDamien Miller <djm@mindrot.org>2020-03-13 13:18:09 +1100
commitfbff605e637b068061ab6784ff03e3874890c092 (patch)
tree6aa0938d8c984b086a9a2b3aae924b4f0f76bb4e
parentbc30b446841fc16e50ed6e75c56ccfbd37b9f281 (diff)
upstream: fix possible null-deref in check_key_not_revoked; ok
djm OpenBSD-Commit-ID: 80855e9d7af42bb6fcc16c074ba69876bfe5e3bf
-rw-r--r--hostfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hostfile.c b/hostfile.c
index 7af47adf..a4a35597 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.78 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: hostfile.c,v 1.79 2020/03/06 18:25:12 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -312,7 +312,7 @@ check_key_not_revoked(struct hostkeys *hostkeys, struct sshkey *k)
continue;
if (sshkey_equal_public(k, hostkeys->entries[i].key))
return -1;
- if (is_cert &&
+ if (is_cert && k != NULL &&
sshkey_equal_public(k->cert->signature_key,
hostkeys->entries[i].key))
return -1;