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 /sshd.c | |
parent | 788ac799a6efa40517f2ac0d895a610394298ffc (diff) |
upstream commit
remove KEY_RSA1
ok markus@
Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.486 2017/04/30 23:13:25 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.487 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 |
@@ -1676,14 +1676,6 @@ main(int ac, char **av) | |||
1676 | key = key_load_private(options.host_key_files[i], "", NULL); | 1676 | key = key_load_private(options.host_key_files[i], "", NULL); |
1677 | pubkey = key_load_public(options.host_key_files[i], NULL); | 1677 | pubkey = key_load_public(options.host_key_files[i], NULL); |
1678 | 1678 | ||
1679 | if ((pubkey != NULL && pubkey->type == KEY_RSA1) || | ||
1680 | (key != NULL && key->type == KEY_RSA1)) { | ||
1681 | verbose("Ignoring RSA1 key %s", | ||
1682 | options.host_key_files[i]); | ||
1683 | key_free(key); | ||
1684 | key_free(pubkey); | ||
1685 | continue; | ||
1686 | } | ||
1687 | if (pubkey == NULL && key != NULL) | 1679 | if (pubkey == NULL && key != NULL) |
1688 | pubkey = key_demote(key); | 1680 | pubkey = key_demote(key); |
1689 | sensitive_data.host_keys[i] = key; | 1681 | sensitive_data.host_keys[i] = key; |