diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2015-07-15 08:00:12 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2015-07-15 08:00:12 +0000 |
| commit | dad72b3bf4c016a01e0a62844ecab69b5f8cc78e (patch) | |
| tree | 6d659979fee87f7a7d4593fe6cf7526df0b4f57a /usr.bin/ssh/sshd.c | |
| parent | 87df4f978c9e42150fb9825bc0e30f1ef7f20ff4 (diff) | |
fix NULL-deref when SSH1 reenabled
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index fd59373ffdb..e01665a754f 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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 @@ -761,7 +761,7 @@ list_hostkey_types(void) 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), |