Don't try to generate ssh keys if ssh isn't installed.

2002-03-19 03:45:02 +00:00 · 2002-03-19 03:45:02 +00:00 · dde1888c4a
commit dde1888c4a
parent 0e3c27aef0
7 changed files with 77 additions and 49 deletions
--- a/etc/network.subr
+++ b/etc/network.subr
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac
--- a/etc/rc.network
+++ b/etc/rc.network
@ -847,13 +847,17 @@ network_pass3() {

 	case ${sshd_enable} in
 	[Yy][Ee][Ss])
-		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';
-			/usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key
+		if [ -x /usr/bin/ssh-keygen ]; then
+			if [ ! -f /etc/ssh/ssh_host_key ]; then
+				echo ' creating ssh RSA host key';
+				/usr/bin/ssh-keygen -trsa1 -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 -tdsa -N "" \
+					-f /etc/ssh/ssh_host_dsa_key
+			fi
 		fi
 		;;
 	esac