diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-05-01 01:18:44 +0200 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 02:05:01 +0200 |
commit | 873d3e7d9a4707d0934fb4c4299354418f91b541 (patch) | |
tree | 4fd961131c84ad1626f11ffdcdc4316a26febacb /clientloop.c | |
parent | upstream commit (diff) | |
download | openssh-873d3e7d9a4707d0934fb4c4299354418f91b541.tar.xz openssh-873d3e7d9a4707d0934fb4c4299354418f91b541.zip |
upstream commit
remove KEY_RSA1
ok markus@
Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c index 469a2f00a..018688a81 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.292 2017/04/30 23:13:25 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.293 2017/04/30 23:18:44 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1831,8 +1831,7 @@ hostkeys_find(struct hostkey_foreach_line *l, void *_ctx) size_t i; struct sshkey **tmp; - if (l->status != HKF_STATUS_MATCHED || l->key == NULL || - l->key->type == KEY_RSA1) + if (l->status != HKF_STATUS_MATCHED || l->key == NULL) return 0; /* Mark off keys we've already seen for this host */ |