summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 134a37162..318d5d3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,11 @@
35 - jmc@cvs.openbsd.org 2010/09/04 09:38:34 35 - jmc@cvs.openbsd.org 2010/09/04 09:38:34
36 [ssh-add.1 ssh.1] 36 [ssh-add.1 ssh.1]
37 two more EXIT STATUS sections; 37 two more EXIT STATUS sections;
38 - naddy@cvs.openbsd.org 2010/09/06 17:10:19
39 [sshd_config]
40 add ssh_host_ecdsa_key to /etc; from Mattieu Baptiste
41 <mattieu.b@gmail.com>
42 ok deraadt@
38 43
3920100831 4420100831
40 - OpenBSD CVS Sync 45 - OpenBSD CVS Sync
diff --git a/sshd_config b/sshd_config
index 72fbae37b..4534841c1 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.81 2009/10/08 14:03:41 markus Exp $ 1# $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $
2 2
3# This is the sshd server system-wide configuration file. See 3# This is the sshd server system-wide configuration file. See
4# sshd_config(5) for more information. 4# sshd_config(5) for more information.
@@ -23,6 +23,7 @@
23# HostKeys for protocol version 2 23# HostKeys for protocol version 2
24#HostKey /etc/ssh/ssh_host_rsa_key 24#HostKey /etc/ssh/ssh_host_rsa_key
25#HostKey /etc/ssh/ssh_host_dsa_key 25#HostKey /etc/ssh/ssh_host_dsa_key
26#HostKey /etc/ssh/ssh_host_ecdsa_key
26 27
27# Lifetime and size of ephemeral version 1 server key 28# Lifetime and size of ephemeral version 1 server key
28#KeyRegenerationInterval 1h 29#KeyRegenerationInterval 1h