Add ssh ecdsa hostkey.
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:31:19 +0000 (20:31 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:31:19 +0000 (20:31 +0100)
config/rootfiles/core/47/filelists/files
config/rootfiles/core/47/update.sh
html/cgi-bin/remote.cgi
src/initscripts/init.d/sshd

index 1df41d9..fee8ee2 100644 (file)
@@ -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
index b67200a..ef10f55 100644 (file)
@@ -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
 
index 9737b07..ed8a94d 100644 (file)
@@ -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";
 
index 1bd2346..e99e694 100644 (file)
@@ -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