diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2017-04-30 23:18:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2017-04-30 23:18:45 +0000 |
| commit | fd6407a0f70d14e8587daefec5d3e104054f23b9 (patch) | |
| tree | 4b01b0255c590a421d2def953606ccffb0de789c /usr.bin/ssh/sshd.c | |
| parent | 07a62fbd4577c37c387bd0acdab3c1ef7da3d8c8 (diff) | |
remove KEY_RSA1
ok markus@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index fcde14dee4c..e943cb256d9 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.486 2017/04/30 23:13:25 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.487 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 @@ -1550,14 +1550,6 @@ main(int ac, char **av) key = key_load_private(options.host_key_files[i], "", NULL); pubkey = key_load_public(options.host_key_files[i], NULL); - if ((pubkey != NULL && pubkey->type == KEY_RSA1) || - (key != NULL && key->type == KEY_RSA1)) { - verbose("Ignoring RSA1 key %s", - options.host_key_files[i]); - key_free(key); - key_free(pubkey); - continue; - } if (pubkey == NULL && key != NULL) pubkey = key_demote(key); sensitive_data.host_keys[i] = key; |