summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjjakob <jernej.jakob@gmail.com>2019-10-19 03:19:54 +0200
committerjjakob <jernej.jakob@gmail.com>2019-10-19 03:19:54 +0200
commit9f1cc848d194d9b85d839ef847df5062d56941c2 (patch)
treec26230dd68d7a50870e13a997234c951a373223e
parent001239d85271401c2ae33c6a6cbe4df7b93b5009 (diff)
downloadvyatta-cfg-system-9f1cc848d194d9b85d839ef847df5062d56941c2.tar.gz
vyatta-cfg-system-9f1cc848d194d9b85d839ef847df5062d56941c2.zip
T1743: do not generate ssh rsa1 host keys
-rwxr-xr-xdebian/vyatta-cfg-system.postinst.in6
-rwxr-xr-xscripts/rl-system.init4
2 files changed, 0 insertions, 10 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 18e84055..708251b3 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -60,12 +60,6 @@ if [ "$sysconfdir" != "/etc" ]; then
sed -i 's/^#PasswordAuthentication/PasswordAuthentication/' /etc/ssh/sshd_config
sed -i '/^PasswordAuthentication/s/no/yes/' /etc/ssh/sshd_config
- # add HostKeys for protocol version 1
- if ! grep -q '^HostKey /etc/ssh/ssh_host_key' /etc/ssh/sshd_config; then
- echo '# HostKey for protocol version 1' >> /etc/ssh/sshd_config
- echo 'HostKey /etc/ssh/ssh_host_key' >> /etc/ssh/sshd_config
- fi
-
# add UseDNS line
sed -i '/^UseDNS/d' /etc/ssh/sshd_config
echo 'UseDNS yes' >>/etc/ssh/sshd_config
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 62eac9e7..0af72cd9 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -112,10 +112,6 @@ create_ssh_host_keys () {
syslog "Creating ssh v2 dsa host key."
ssh-keygen -q -N '' -t dsa -f /etc/ssh/ssh_host_dsa_key
fi;
- if [ ! -f "/etc/ssh/ssh_host_key" ]; then
- syslog "Creating ssh v1 host key."
- ssh-keygen -q -N '' -t rsa1 -f /etc/ssh/ssh_host_key
- fi;
if [ ! -f "/etc/ssh/ssh_host_ed25519_key" ]; then
syslog "Creating ssh ed25519 host key."
ssh-keygen -q -N '' -t ed25519 -f /etc/ssh/ssh_host_ed25519_key