aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2002-04-10 22:30:54 +0000
committerPeter Wemm <peter@FreeBSD.org>2002-04-10 22:30:54 +0000
commit6636027fe4bd94f6f387387acfeebea1ca560154 (patch)
treeced5160c4d78e9d3c64abbca5af942f3228e0ae2 /etc
parent898568d8abf87f3e37f154641dd9c88f7aed2706 (diff)
Notes
Diffstat (limited to 'etc')
-rw-r--r--etc/network.subr13
-rw-r--r--etc/rc.d/netoptions13
-rw-r--r--etc/rc.d/network113
-rw-r--r--etc/rc.d/network213
-rw-r--r--etc/rc.d/network313
-rw-r--r--etc/rc.d/routing13
-rw-r--r--etc/rc.network13
7 files changed, 63 insertions, 28 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.network b/etc/rc.network
index 8d779eaac991..d7e8bca3a559 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -853,15 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
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 "" \
+ echo ' creating ssh protocol v1 RSA host key';
+ /usr/bin/ssh-keygen -t rsa1 -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 "" \
+ echo ' creating ssh protocol v2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
-f /etc/ssh/ssh_host_dsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+ echo ' creating ssh protocol v2 RSA host key';
+ /usr/bin/ssh-keygen -t rsa -N "" \
+ -f /etc/ssh/ssh_host_rsa_key
+ fi
fi
;;
esac