===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd.c,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- src/usr.bin/ssh/sshd.c	2015/07/10 06:21:53	1.454
+++ src/usr.bin/ssh/sshd.c	2015/07/15 08:00:11	1.455
@@ -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
@@ -761,7 +761,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),