webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ssh: preferre ecdsa cipher again.

Browse Source 
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>
This commit is contained in:
Arne Fitzenreiter
2015-10-24 12:07:29 +02:00
parent b4dd976c20
commit 3a6784c065
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/rootfiles/core/94/update.sh
View File

@@ -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}

7
lfs/openssh
View File

@@ -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)