commit df56a8035d429b2184ee94aaa7e580c1ff67f73a
author djm@openbsd.org <djm@openbsd.org> Wed Jul 15 08:00:11 2015 +0000
committer Damien Miller <djm@mindrot.org> Wed Jul 15 18:02:12 2015 +1000
tree 918316a869880bc53db40ae39ee4766a3435c7b9
parent 41e38c4d49dd60908484e6703316651333f16b93

upstream commit

fix NULL-deref when SSH1 reenabled

Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295

sshd.c

diff --git a/sshd.c b/sshd.c
index 81a9b82..4bb34b1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.454 2015/07/10 06:21:53 markus Exp $ */
+/* $OpenBSD: sshd.c,v 1.455 2015/07/15 08:00:11 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -798,7 +798,7 @@
 		key = sensitive_data.host_keys[i];
 		if (key == NULL)
 			key = sensitive_data.host_pubkeys[i];
-		if (key == NULL)
+		if (key == NULL && key->type != KEY_RSA1)
 			continue;
 		/* Check that the key is accepted in HostkeyAlgorithms */
 		if (match_pattern_list(sshkey_ssh_name(key),