Add ssh ecdsa hostkey.

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
index 1df41d9a76e8bc6f6fe2954b027d5a82264da1ad..fee8ee2b063d4d89796b3c30e1eed92daf66505d 100644 (file)
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@ -1,2 +1,4 @@
 etc/system-release
+etc/rc.d/init.d/sshd
 srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/remote.cgi

diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh
index b67200a70a056a7c554b87a7d65d73ddf874c0c2..ef10f558bb79c9bc9c018d51bdd8847dd0fca9d6 100644 (file)
--- a/config/rootfiles/core/47/update.sh
+++ b/config/rootfiles/core/47/update.sh
@@ -34,6 +34,11 @@ rm -f /var/cache/pakfire/core-upgrade-*.ipfire
 #Extract files
 extract_files
 
+#Generate ssh ecdsa host key if not present
+if [ ! -e /etc/ssh/ssh_host_ecdsa_key ]; then
+   ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
+fi
+
 #
 #Start services
 

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 9737b078dde0739e947dfbd0c6f2f1da7ba01bb2..ed8a94d246877251648acbaa63a85ee0069e9790 100644 (file)
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -180,6 +180,7 @@ END
 &viewkey("/etc/ssh/ssh_host_key.pub","RSA1");
 &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2");
 &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA");
+&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA");
 
 print "</table>\n";
 

diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 1bd23460a89cff6de8d8e30576bf80d25cc0deba..e99e6940562f310c20fd79a1e1ec86a167bda768 100644 (file)
--- a/src/initscripts/init.d/sshd
+++ b/src/initscripts/init.d/sshd
@@ -17,6 +17,7 @@ case "$1" in
        ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
        ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
        ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
+       ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
     fi
 
         [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled