Restore the RSA host key to /etc/ssh/ssh_host_key.

Also fix $FreeBSD$ spamage in crypto/openssh/sshd_config rev. 1.16.

8 files changed, 22 insertions, 58 deletions

diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index dad02ea..854311f 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: sshd_config,v 1.38 2001/04/15 21:41:29 deraadt Exp $
-#	$FreeBSD$
+# $FreeBSD$
 
 # This is the sshd server system-wide configuration file.  See sshd(8)
 # for more information.
@@ -9,7 +9,6 @@ Port 22
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 HostKey /etc/ssh/ssh_host_key
-HostKey /etc/ssh/ssh_host_rsa_key
 HostKey /etc/ssh/ssh_host_dsa_key
 ServerKeyBits 768
 LoginGraceTime 120
diff --git a/etc/network.subr b/etc/network.subr
index 65e79ae..fbe8bf3 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';
diff --git a/etc/rc.network b/etc/rc.network
index 65e79ae..fbe8bf3 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -720,14 +720,9 @@ network_pass3() {
 
 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-			if [ -f /etc/ssh/ssh_host_key ]; then
-				/bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key
-				/bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub
-			else
-				echo ' creating ssh RSA host key';
-				/usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
-			fi
+		if [ ! -f /etc/ssh/ssh_host_key ]; then
+			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';