Create a DSA host key if one does not already exist, and teach sshd_config

about it.

8 files changed, 43 insertions, 7 deletions

diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 4596cb8..c17868a 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -7,6 +7,7 @@ Port 22
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 HostKey /etc/ssh/ssh_host_key
+HostKey /etc/ssh/ssh_dsa_host_key
 ServerKeyBits 768
 LoginGraceTime 60
 KeyRegenerationInterval 3600
diff --git a/etc/network.subr b/etc/network.subr
index a03e000..50ab079 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index a03e000..50ab079 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index a03e000..50ab079 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index a03e000..50ab079 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index a03e000..50ab079 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index a03e000..50ab079 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'
diff --git a/etc/rc.network b/etc/rc.network
index a03e000..50ab079 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -621,10 +621,15 @@ network_pass3() {
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
 		if [ ! -f /etc/ssh/ssh_host_key ]; then
-			echo ' creating ssh host key';
+			echo ' creating ssh RSA host key';
 			/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
 		fi
 		;;
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+			echo ' creating ssh DSA host key';
+			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		fi
+		;;
 	esac
 
 	echo '.'