[csw-devel] SF.net SVN: gar:[15221] csw/mgar/pkg/openssh/trunk/files

[chninkel at users.sourceforge.net]

Revision: 15221
          http://gar.svn.sourceforge.net/gar/?rev=15221&view=rev
Author:   chninkel
Date:     2011-07-25 17:56:45 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
openssh: added generation of eliptic curve algorithm host key in init script

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW
    csw/mgar/pkg/openssh/trunk/files/cswopenssh
    csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2011-07-25 17:16:39 UTC (rev 15220)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2011-07-25 17:56:45 UTC (rev 15221)
@@ -1,3 +1,9 @@
+openssh (5.8p1,REV=2011.07.25) unstable
+
+  * Added the generation of eliptic curve algoritm host keys in init script.
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 25 Jul 2011 19:55:16 +0200
+
 openssh (5.8p1,REV=2011.02.12) unstable
 
   * New upstream release.

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2011-07-25 17:16:39 UTC (rev 15220)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2011-07-25 17:56:45 UTC (rev 15221)
@@ -17,15 +17,12 @@
 case $1 in 
 'start')
         if [ -x /opt/csw/bin/ssh-keygen ]; then
-                if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then
-                        echo "Creating new RSA public/private host key pair"
-                        ssh-keygen -f $KEYDIR/ssh_host_rsa_key -t rsa -N ''
-                fi
-
-                if [ ! -f "$KEYDIR/ssh_host_dsa_key" ]; then
-                        echo "Creating new DSA public/private host key pair"
-                        ssh-keygen -f $KEYDIR/ssh_host_dsa_key -t dsa -N ''
-                fi     
+		for ALGO in rsa dsa ecdsa; do
+			if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
+				echo "Creating new ${ALGO} public/private host key pair"
+				ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t rsa -N ''
+			fi
+		done
         fi
 
         [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2011-07-25 17:16:39 UTC (rev 15220)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2011-07-25 17:56:45 UTC (rev 15221)
@@ -5,15 +5,12 @@
 KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/cswsshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
-	if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then
-		echo "Creating new RSA public/private host key pair"
-		/opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_rsa_key -t rsa -N ''
-	fi
-
-	if [ ! -f "$KEYDIR/ssh_host_dsa_key" ]; then
-		echo "Creating new DSA public/private host key pair"
-		/opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_dsa_key -t dsa -N ''
-	fi     
+	for ALGO in rsa dsa ecdsa; do
+		if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
+			echo "Creating new ${ALGO} public/private host key pair"
+			ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t rsa -N ''
+		fi
+	done
 fi
 
 /opt/csw/sbin/sshd


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.