diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-07-17 02:47:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-17 12:48:15 +1000 |
| commit | 25b14610dab655646a109db5ef8cb4c4bf2a48a0 (patch) | |
| tree | d11a7a6c54a283741067fa73e9c06df8d7f17056 /sshd.c | |
| parent | df56a8035d429b2184ee94aaa7e580c1ff67f73a (diff) | |
| download | openssh-git-25b14610dab655646a109db5ef8cb4c4bf2a48a0.tar.gz | |
upstream commit
fix incorrect test for SSH1 keys when compiled without SSH1
support
Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.455 2015/07/15 08:00:11 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.456 2015/07/17 02:47:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -798,7 +798,7 @@ list_hostkey_types(void) key = sensitive_data.host_keys[i]; if (key == NULL) key = sensitive_data.host_pubkeys[i]; - if (key == NULL && key->type != KEY_RSA1) + if (key == NULL || key->type == KEY_RSA1) continue; /* Check that the key is accepted in HostkeyAlgorithms */ if (match_pattern_list(sshkey_ssh_name(key), |