ssh: preferre ecdsa cipher again.

Previous we had not configured it so the ssh default order was used.
Now we define it to disable dsa so we had to give the correct order but
in the example cfg rsa is prefered.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index a9c24a5f8344b712cbe35950cae6ea3bd90ab706..99aa04659c11526998f689c0322056ff55bf05e9 100644 (file)
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -48,9 +48,10 @@ telinit u
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
        -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}

diff --git a/lfs/openssh b/lfs/openssh
index 1178d6ff06fcf4f7bb0f3b5a7242d8d82e54aff0..0bba1ecd9c712ab21e88f93380ded9a6192c0360 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
            -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
            -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
            /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)