summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 11:15:33 +1000
committerDamien Miller <djm@mindrot.org>2010-09-10 11:15:33 +1000
commite13cadf41b920ccce3eb51e600a61ceaf1c37542 (patch)
treeda59d18171ad89da3682f04a9b2157b905bae9fc /servconf.c
parentd44279029243ca238682bbc171e80531badbd3fb (diff)
- naddy@cvs.openbsd.org 2010/09/01 15:21:35
[servconf.c] pick up ECDSA host key by default; ok djm@
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index 986a5b92f..def6b716a 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.209 2010/06/22 04:22:59 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.210 2010/09/01 15:21:35 naddy Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -154,6 +154,8 @@ fill_default_server_options(ServerOptions *options)
154 _PATH_HOST_RSA_KEY_FILE; 154 _PATH_HOST_RSA_KEY_FILE;
155 options->host_key_files[options->num_host_key_files++] = 155 options->host_key_files[options->num_host_key_files++] =
156 _PATH_HOST_DSA_KEY_FILE; 156 _PATH_HOST_DSA_KEY_FILE;
157 options->host_key_files[options->num_host_key_files++] =
158 _PATH_HOST_ECDSA_KEY_FILE;
157 } 159 }
158 } 160 }
159 /* No certificates by default */ 161 /* No certificates by default */