summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sshd.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index df694fe3d..0b544f9f0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.483 2017/02/24 03:16:34 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.484 2017/03/15 02:19:09 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
@@ -1675,6 +1675,15 @@ main(int ac, char **av)
1675 continue; 1675 continue;
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
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 }
1678 if (pubkey == NULL && key != NULL) 1687 if (pubkey == NULL && key != NULL)
1679 pubkey = key_demote(key); 1688 pubkey = key_demote(key);
1680 sensitive_data.host_keys[i] = key; 1689 sensitive_data.host_keys[i] = key;