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 48a2495afd78163adfd984689ab1c08091fdd2d3 (commit) via abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 (commit) from db0798e82af1d7bdc83f319d06276c923d4fc012 (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 48a2495afd78163adfd984689ab1c08091fdd2d3 Merge: abcbbd1 db0798e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Feb 18 20:33:00 2011 +0100
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts: config/rootfiles/core/47/filelists/files
commit abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Feb 18 20:31:19 2011 +0100
Add ssh ecdsa hostkey.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/47/filelists/files | 2 ++ config/rootfiles/core/47/update.sh | 5 +++++ html/cgi-bin/remote.cgi | 3 ++- src/initscripts/init.d/sshd | 1 + 4 files changed, 10 insertions(+), 1 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index befb6bf..adbbd29 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,4 +1,6 @@ etc/system-release +etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/ids.cgi var/ipfire/backup/include diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index b67200a..ef10f55 100644 --- 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 9737b07..ed8a94d 100644 --- 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 1bd2346..e99e694 100644 --- 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
hooks/post-receive -- IPFire 2.x development tree