diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | contrib/caldera/ssh-host-keygen | 10 | ||||
-rw-r--r-- | contrib/suse/rc.sshd | 6 |
3 files changed, 12 insertions, 9 deletions
@@ -106,6 +106,9 @@ | |||
106 | - stevesk@cvs.openbsd.org 2008/11/03 02:44:41 | 106 | - stevesk@cvs.openbsd.org 2008/11/03 02:44:41 |
107 | [readconf.c] | 107 | [readconf.c] |
108 | fix comment | 108 | fix comment |
109 | - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd] | ||
110 | Make example scripts generate keys with default sizes rather than fixed, | ||
111 | non-default 1024 bits; patch from imorgan AT nas.nasa.gov | ||
109 | 112 | ||
110 | 20080906 | 113 | 20080906 |
111 | - (dtucker) [config.guess config.sub] Update to latest versions from | 114 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4840,4 +4843,4 @@ | |||
4840 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4843 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4841 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4844 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4842 | 4845 | ||
4843 | $Id: ChangeLog,v 1.5125 2008/11/03 08:28:21 djm Exp $ | 4846 | $Id: ChangeLog,v 1.5126 2008/11/03 09:16:01 djm Exp $ |
diff --git a/contrib/caldera/ssh-host-keygen b/contrib/caldera/ssh-host-keygen index 3c5c17182..86382ddfb 100755 --- a/contrib/caldera/ssh-host-keygen +++ b/contrib/caldera/ssh-host-keygen | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # | 2 | # |
3 | # $Id: ssh-host-keygen,v 1.2 2003/11/21 12:48:57 djm Exp $ | 3 | # $Id: ssh-host-keygen,v 1.3 2008/11/03 09:16:01 djm Exp $ |
4 | # | 4 | # |
5 | # This script is normally run only *once* for a given host | 5 | # This script is normally run only *once* for a given host |
6 | # (in a given period of time) -- on updates/upgrades/recovery | 6 | # (in a given period of time) -- on updates/upgrades/recovery |
@@ -15,16 +15,16 @@ if [ -f $keydir/ssh_host_key -o \ | |||
15 | -f $keydir/ssh_host_key.pub ]; then | 15 | -f $keydir/ssh_host_key.pub ]; then |
16 | echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." | 16 | echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." |
17 | else | 17 | else |
18 | echo "Generating 1024 bit SSH1 RSA host key." | 18 | echo "Generating SSH1 RSA host key." |
19 | $keygen -b 1024 -t rsa1 -f $keydir/ssh_host_key -C '' -N '' | 19 | $keygen -t rsa1 -f $keydir/ssh_host_key -C '' -N '' |
20 | fi | 20 | fi |
21 | 21 | ||
22 | if [ -f $keydir/ssh_host_rsa_key -o \ | 22 | if [ -f $keydir/ssh_host_rsa_key -o \ |
23 | -f $keydir/ssh_host_rsa_key.pub ]; then | 23 | -f $keydir/ssh_host_rsa_key.pub ]; then |
24 | echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." | 24 | echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." |
25 | else | 25 | else |
26 | echo "Generating 1024 bit SSH2 RSA host key." | 26 | echo "Generating SSH2 RSA host key." |
27 | $keygen -b 1024 -t rsa -f $keydir/ssh_host_rsa_key -C '' -N '' | 27 | $keygen -t rsa -f $keydir/ssh_host_rsa_key -C '' -N '' |
28 | fi | 28 | fi |
29 | 29 | ||
30 | if [ -f $keydir/ssh_host_dsa_key -o \ | 30 | if [ -f $keydir/ssh_host_dsa_key -o \ |
diff --git a/contrib/suse/rc.sshd b/contrib/suse/rc.sshd index 573960bfa..4d4880d7e 100644 --- a/contrib/suse/rc.sshd +++ b/contrib/suse/rc.sshd | |||
@@ -45,17 +45,17 @@ case "$1" in | |||
45 | start) | 45 | start) |
46 | if ! test -f /etc/ssh/ssh_host_key ; then | 46 | if ! test -f /etc/ssh/ssh_host_key ; then |
47 | echo Generating /etc/ssh/ssh_host_key. | 47 | echo Generating /etc/ssh/ssh_host_key. |
48 | ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N '' | 48 | ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' |
49 | fi | 49 | fi |
50 | if ! test -f /etc/ssh/ssh_host_dsa_key ; then | 50 | if ! test -f /etc/ssh/ssh_host_dsa_key ; then |
51 | echo Generating /etc/ssh/ssh_host_dsa_key. | 51 | echo Generating /etc/ssh/ssh_host_dsa_key. |
52 | 52 | ||
53 | ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N '' | 53 | ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' |
54 | fi | 54 | fi |
55 | if ! test -f /etc/ssh/ssh_host_rsa_key ; then | 55 | if ! test -f /etc/ssh/ssh_host_rsa_key ; then |
56 | echo Generating /etc/ssh/ssh_host_rsa_key. | 56 | echo Generating /etc/ssh/ssh_host_rsa_key. |
57 | 57 | ||
58 | ssh-keygen -t rsa -b 1024 -f /etc/ssh/ssh_host_rsa_key -N '' | 58 | ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' |
59 | fi | 59 | fi |
60 | echo -n "Starting SSH daemon" | 60 | echo -n "Starting SSH daemon" |
61 | ## Start daemon with startproc(8). If this fails | 61 | ## Start daemon with startproc(8). If this fails |