upstream commit

remove KEY_RSA1

ok markus@

Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133

1 files changed, 1 insertions, 9 deletions

diff --git a/sshd.c b/sshd.c
index d18da6bdf..f128912b5 100644
--- a/sshd.c
+++ b/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
@@ -1676,14 +1676,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;