tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd] 

Make example scripts generate keys with default sizes rather than fixed,
   non-default 1024 bits; patch from imorgan AT nas.nasa.gov
This commit is contained in:
Damien Miller 2008-11-03 20:16:01 +11:00
parent f4b39538f4
commit 85dec73463
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -106,6 +106,9 @@
- stevesk@cvs.openbsd.org 2008/11/03 02:44:41 - stevesk@cvs.openbsd.org 2008/11/03 02:44:41
[readconf.c] [readconf.c]
fix comment fix comment
- (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd]
Make example scripts generate keys with default sizes rather than fixed,
non-default 1024 bits; patch from imorgan AT nas.nasa.gov
20080906 20080906
- (dtucker) [config.guess config.sub] Update to latest versions from - (dtucker) [config.guess config.sub] Update to latest versions from
@ -4840,4 +4843,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5125 2008/11/03 08:28:21 djm Exp $ $Id: ChangeLog,v 1.5126 2008/11/03 09:16:01 djm Exp $

10
contrib/caldera/ssh-host-keygen
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# #
# $Id: ssh-host-keygen,v 1.2 2003/11/21 12:48:57 djm Exp $ # $Id: ssh-host-keygen,v 1.3 2008/11/03 09:16:01 djm Exp $
# #
# This script is normally run only *once* for a given host # This script is normally run only *once* for a given host
# (in a given period of time) -- on updates/upgrades/recovery # (in a given period of time) -- on updates/upgrades/recovery
@ -15,16 +15,16 @@ if [ -f $keydir/ssh_host_key -o \
-f $keydir/ssh_host_key.pub ]; then -f $keydir/ssh_host_key.pub ]; then
echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key."
else else
echo "Generating 1024 bit SSH1 RSA host key." echo "Generating SSH1 RSA host key."
$keygen -b 1024 -t rsa1 -f $keydir/ssh_host_key -C '' -N '' $keygen -t rsa1 -f $keydir/ssh_host_key -C '' -N ''
fi fi
if [ -f $keydir/ssh_host_rsa_key -o \ if [ -f $keydir/ssh_host_rsa_key -o \
-f $keydir/ssh_host_rsa_key.pub ]; then -f $keydir/ssh_host_rsa_key.pub ]; then
echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key."
else else
echo "Generating 1024 bit SSH2 RSA host key." echo "Generating SSH2 RSA host key."
$keygen -b 1024 -t rsa -f $keydir/ssh_host_rsa_key -C '' -N '' $keygen -t rsa -f $keydir/ssh_host_rsa_key -C '' -N ''
fi fi
if [ -f $keydir/ssh_host_dsa_key -o \ if [ -f $keydir/ssh_host_dsa_key -o \

6
contrib/suse/rc.sshd
View File

@ -45,17 +45,17 @@ case "$1" in
start) start)
if ! test -f /etc/ssh/ssh_host_key ; then if ! test -f /etc/ssh/ssh_host_key ; then
echo Generating /etc/ssh/ssh_host_key. echo Generating /etc/ssh/ssh_host_key.
ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N '' ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ''
fi fi
if ! test -f /etc/ssh/ssh_host_dsa_key ; then if ! test -f /etc/ssh/ssh_host_dsa_key ; then
echo Generating /etc/ssh/ssh_host_dsa_key. echo Generating /etc/ssh/ssh_host_dsa_key.
ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N '' ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
fi fi
if ! test -f /etc/ssh/ssh_host_rsa_key ; then if ! test -f /etc/ssh/ssh_host_rsa_key ; then
echo Generating /etc/ssh/ssh_host_rsa_key. echo Generating /etc/ssh/ssh_host_rsa_key.
ssh-keygen -t rsa -b 1024 -f /etc/ssh/ssh_host_rsa_key -N '' ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
fi fi
echo -n "Starting SSH daemon" echo -n "Starting SSH daemon"
## Start daemon with startproc(8). If this fails ## Start daemon with startproc(8). If this fails