summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--servconf.c4
-rw-r--r--sshd.86
-rw-r--r--sshd_config4
-rw-r--r--sshd_config.56
5 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index fadf27a7d..9e7326d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@
24 - stevesk@cvs.openbsd.org 2008/07/01 23:12:47 24 - stevesk@cvs.openbsd.org 2008/07/01 23:12:47
25 [PROTOCOL.agent] 25 [PROTOCOL.agent]
26 fix some typos; ok djm@ 26 fix some typos; ok djm@
27 - djm@cvs.openbsd.org 2008/07/02 02:24:18
28 [sshd_config sshd_config.5 sshd.8 servconf.c]
29 increase default size of ssh protocol 1 ephemeral key from 768 to 1024
30 bits; prodded by & ok dtucker@ ok deraadt@
27 31
2820080630 3220080630
29 - (djm) OpenBSD CVS Sync 33 - (djm) OpenBSD CVS Sync
@@ -4507,4 +4511,4 @@
4507 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4511 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4508 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4512 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4509 4513
4510$Id: ChangeLog,v 1.5045 2008/07/02 12:35:00 dtucker Exp $ 4514$Id: ChangeLog,v 1.5046 2008/07/02 12:35:43 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index 67e7d7db3..9d9c9508e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.184 2008/06/15 16:58:40 dtucker Exp $ */ 1/* $OpenBSD: servconf.c,v 1.185 2008/07/02 02:24:18 djm 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
@@ -158,7 +158,7 @@ fill_default_server_options(ServerOptions *options)
158 if (options->pid_file == NULL) 158 if (options->pid_file == NULL)
159 options->pid_file = _PATH_SSH_DAEMON_PID_FILE; 159 options->pid_file = _PATH_SSH_DAEMON_PID_FILE;
160 if (options->server_key_bits == -1) 160 if (options->server_key_bits == -1)
161 options->server_key_bits = 768; 161 options->server_key_bits = 1024;
162 if (options->login_grace_time == -1) 162 if (options->login_grace_time == -1)
163 options->login_grace_time = 120; 163 options->login_grace_time = 120;
164 if (options->key_regeneration_time == -1) 164 if (options->key_regeneration_time == -1)
diff --git a/sshd.8 b/sshd.8
index fdbe7abfa..c4c4181fc 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.245 2008/06/11 07:30:37 jmc Exp $ 37.\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $
38.Dd $Mdocdate: June 11 2008 $ 38.Dd $Mdocdate: July 2 2008 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -100,7 +100,7 @@ Forces
100to use IPv6 addresses only. 100to use IPv6 addresses only.
101.It Fl b Ar bits 101.It Fl b Ar bits
102Specifies the number of bits in the ephemeral protocol version 1 102Specifies the number of bits in the ephemeral protocol version 1
103server key (default 768). 103server key (default 1024).
104.It Fl C Ar connection_spec 104.It Fl C Ar connection_spec
105Specify the connection parameters to use for the 105Specify the connection parameters to use for the
106.Fl T 106.Fl T
diff --git a/sshd_config b/sshd_config
index c5ee7c8a4..1b53a0efb 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.79 2008/05/08 12:21:16 djm Exp $ 1# $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm 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.
@@ -28,7 +28,7 @@ Protocol 2
28 28
29# Lifetime and size of ephemeral version 1 server key 29# Lifetime and size of ephemeral version 1 server key
30#KeyRegenerationInterval 1h 30#KeyRegenerationInterval 1h
31#ServerKeyBits 768 31#ServerKeyBits 1024
32 32
33# Logging 33# Logging
34# obsoletes QuietMode and FascistLogging 34# obsoletes QuietMode and FascistLogging
diff --git a/sshd_config.5 b/sshd_config.5
index 0d41edf98..7255b1c22 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.95 2008/06/15 16:58:40 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $
38.Dd $Mdocdate: June 15 2008 $ 38.Dd $Mdocdate: July 2 2008 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -811,7 +811,7 @@ The default is
811This option applies to protocol version 1 only. 811This option applies to protocol version 1 only.
812.It Cm ServerKeyBits 812.It Cm ServerKeyBits
813Defines the number of bits in the ephemeral protocol version 1 server key. 813Defines the number of bits in the ephemeral protocol version 1 server key.
814The minimum value is 512, and the default is 768. 814The minimum value is 512, and the default is 1024.
815.It Cm StrictModes 815.It Cm StrictModes
816Specifies whether 816Specifies whether
817.Xr sshd 8 817.Xr sshd 8