- Generate DSA host keys during "make key" or RPM installs

diff --git a/ChangeLog b/ChangeLog
index c6e3548a8c285c24137cbda33e0edab0570146d8..6c84661072fc12ec632e9dcc015ce616cf3eb8a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000508
+ - Makefile and RPM spec fixes
+ - Generate DSA host keys during "make key" or RPM installs
+
 20000507
  - Remove references to SSLeay.
  - Big OpenBSD CVS update

diff --git a/Makefile.in b/Makefile.in
index de2fbd269c652e152b6e57ae5c834b0d449d686f..8d2c71b952983bfc100870ce007fd5b0ee12695f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,6 +133,7 @@ install: manpages $(TARGETS)
 
 host-key: ssh-keygen
        ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ''
+       ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ''
 
 uninstallall:  uninstall
        -rm -f $(DESTDIR)$(sysconfdir)/ssh_config

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index be76c9650d734c3f55abc0e929921dc1023e3d4a..96e972cf1bfa410eaa679228238bda81403bdc9c 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
 if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
        /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2
 fi
+if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
+       /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2
+fi
 if test -r /var/run/sshd.pid
 then
        /etc/rc.d/init.d/sshd restart >&2

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7d5d087a8dd56142cda05061ff22b5ebdb37428b..0f63ef6581428b249eebc6a5b6ee63a9a0ae037b 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -197,6 +197,10 @@ if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
         echo "Generating SSH host key..."
        /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2
 fi
+if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
+        echo "Generating SSH DSA host key..."
+       /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2
+fi
 if test -r /var/run/sshd.pid
 then
         echo "Restarting the running SSH daemon..."