[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3a6784c065ca6513444f81d073874ff8118c6380

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3450 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  3a6784c065ca6513444f81d073874ff8118c6380 (commit)
      from  b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3a6784c065ca6513444f81d073874ff8118c6380
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Oct 24 12:07:29 2015 +0200

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/94/update.sh | 7 ++++---
 lfs/openssh                        | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index a9c24a5..99aa046 100644
--- 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 1178d6f..0bba1ec 100644
--- 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)


hooks/post-receive
--
IPFire 2.x development tree