summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-02-16 02:32:40 +0000
committerDamien Miller <djm@mindrot.org>2018-02-16 13:35:28 +1100
commit88c50a5ae20902715f0fca306bb9c38514f71679 (patch)
tree617acb6a9239602c4906e5664704f2adaaeaac13 /servconf.c
parentd2b3db2860c962927def39a52f67f1c23f7b201a (diff)
upstream: stop loading DSA keys by default, remove sshd_config
stanza and manpage bits; from Colin Watson via bz#2662, ok dtucker@ OpenBSD-Commit-ID: d33a849f481684ff655c140f5eb1b4acda8c5c09
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index f0ab429a1..bf8ad671d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.323 2018/02/09 02:37:36 dtucker Exp $ */ 2/* $OpenBSD: servconf.c,v 1.324 2018/02/16 02:32:40 djm Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -247,8 +247,6 @@ fill_default_server_options(ServerOptions *options)
247 /* fill default hostkeys for protocols */ 247 /* fill default hostkeys for protocols */
248 servconf_add_hostkey("[default]", 0, options, 248 servconf_add_hostkey("[default]", 0, options,
249 _PATH_HOST_RSA_KEY_FILE); 249 _PATH_HOST_RSA_KEY_FILE);
250 servconf_add_hostkey("[default]", 0, options,
251 _PATH_HOST_DSA_KEY_FILE);
252#ifdef OPENSSL_HAS_ECC 250#ifdef OPENSSL_HAS_ECC
253 servconf_add_hostkey("[default]", 0, options, 251 servconf_add_hostkey("[default]", 0, options,
254 _PATH_HOST_ECDSA_KEY_FILE); 252 _PATH_HOST_ECDSA_KEY_FILE);