diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:18:44 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 10:05:01 +1000 |
| commit | 873d3e7d9a4707d0934fb4c4299354418f91b541 (patch) | |
| tree | 4fd961131c84ad1626f11ffdcdc4316a26febacb /clientloop.c | |
| parent | 788ac799a6efa40517f2ac0d895a610394298ffc (diff) | |
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 @@ | |||
| 1 | /* $OpenBSD: clientloop.c,v 1.292 2017/04/30 23:13:25 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.293 2017/04/30 23:18:44 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| @@ -1831,8 +1831,7 @@ hostkeys_find(struct hostkey_foreach_line *l, void *_ctx) | |||
| 1831 | size_t i; | 1831 | size_t i; |
| 1832 | struct sshkey **tmp; | 1832 | struct sshkey **tmp; |
| 1833 | 1833 | ||
| 1834 | if (l->status != HKF_STATUS_MATCHED || l->key == NULL || | 1834 | if (l->status != HKF_STATUS_MATCHED || l->key == NULL) |
| 1835 | l->key->type == KEY_RSA1) | ||
| 1836 | return 0; | 1835 | return 0; |
| 1837 | 1836 | ||
| 1838 | /* Mark off keys we've already seen for this host */ | 1837 | /* Mark off keys we've already seen for this host */ |