svn commit: r397772 - in head/security/openssh-portable-devel: . files

[Bryan Drewery]

Author: bdrewery
Date: Thu Sep 24 22:05:23 2015
New Revision: 397772
URL: https://svnweb.freebsd.org/changeset/ports/397772

Log:
  - Update to latest snapshot.
  - Remove obsoleted RSA Protocol 1 ssh_host_key support from the rc script [1]
  
  PR:		202792 [1]

Modified:
  head/security/openssh-portable-devel/Makefile
  head/security/openssh-portable-devel/distinfo
  head/security/openssh-portable-devel/files/extra-patch-hpn
  head/security/openssh-portable-devel/files/openssh.in

Modified: head/security/openssh-portable-devel/Makefile
==============================================================================
--- head/security/openssh-portable-devel/Makefile	Thu Sep 24 21:54:40 2015	(r397771)
+++ head/security/openssh-portable-devel/Makefile	Thu Sep 24 22:05:23 2015	(r397772)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssh
-DISTVERSION=	20150821
+DISTVERSION=	20150924
 PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.mindrot.org/openssh_snap/ \

Modified: head/security/openssh-portable-devel/distinfo
==============================================================================
--- head/security/openssh-portable-devel/distinfo	Thu Sep 24 21:54:40 2015	(r397771)
+++ head/security/openssh-portable-devel/distinfo	Thu Sep 24 22:05:23 2015	(r397772)
@@ -1,5 +1,5 @@
-SHA256 (openssh-SNAP-20150821.tar.gz) = 6ef0a5996e2c623f42138773ce0860fb52bcf7b8d18a62a9ad596ae4b0463031
-SIZE (openssh-SNAP-20150821.tar.gz) = 1473625
+SHA256 (openssh-SNAP-20150924.tar.gz) = 056ca3e8ad8f13010f82b5f55fe84f7cdd96620728ca63985f2cd11e9686e46c
+SIZE (openssh-SNAP-20150924.tar.gz) = 1474959
 SHA256 (openssh-6.8p1-sctp-2573.patch.gz) = 0348713ad4cb4463e90cf5202ed41c8f726d7d604f3f93922a9aa55b86abf04a
 SIZE (openssh-6.8p1-sctp-2573.patch.gz) = 8531
 SHA256 (openssh-7.0p1+x509-8.5.diff.gz) = 6000557f1ddae06aff8837d440d93342a923fada571fec59fc5dedf388fb5f9e

Modified: head/security/openssh-portable-devel/files/extra-patch-hpn
==============================================================================
--- head/security/openssh-portable-devel/files/extra-patch-hpn	Thu Sep 24 21:54:40 2015	(r397771)
+++ head/security/openssh-portable-devel/files/extra-patch-hpn	Thu Sep 24 22:05:23 2015	(r397772)
@@ -447,9 +447,9 @@ diff -urN -x configure -x config.guess -
  
  echo ""
  
---- work.clean/openssh-6.8p1/kex.c.orig	2015-08-11 01:57:29.000000000 -0700
-+++ work.clean/openssh-6.8p1/kex.c	2015-08-17 17:02:06.770901000 -0700
-@@ -652,6 +652,13 @@ kex_choose_conf(struct ssh *ssh)
+--- work.clean/openssh/kex.c.orig	2015-09-20 21:33:42.000000000 -0700
++++ work.clean/openssh/kex.c	2015-09-24 14:59:44.155826000 -0700
+@@ -668,6 +668,13 @@ kex_choose_conf(struct ssh *ssh)
  	int nenc, nmac, ncomp;
  	u_int mode, ctos, need, dh_need, authlen;
  	int r, first_kex_follows;
@@ -461,9 +461,9 @@ diff -urN -x configure -x config.guess -
 +	debug ("AUTH STATE IS %d", auth_flag);
 +#endif
  
- 	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0 ||
- 	    (r = kex_buf2prop(kex->peer, &first_kex_follows, &peer)) != 0)
-@@ -709,6 +716,17 @@ kex_choose_conf(struct ssh *ssh)
+ 	debug2("local %s KEXINIT proposal", kex->server ? "server" : "client");
+ 	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0)
+@@ -740,6 +747,17 @@ kex_choose_conf(struct ssh *ssh)
  			peer[ncomp] = NULL;
  			goto out;
  		}
@@ -478,7 +478,7 @@ diff -urN -x configure -x config.guess -
 +			}
 +		}
 +#endif
- 		debug("kex: %s %s %s %s",
+ 		debug("kex: %s cipher: %s MAC: %s compression: %s",
  		    ctos ? "client->server" : "server->client",
  		    newkeys->enc.name,
 --- work.clean/openssh-6.8p1/myproposal.h	2015-03-17 00:49:20.000000000 -0500

Modified: head/security/openssh-portable-devel/files/openssh.in
==============================================================================
--- head/security/openssh-portable-devel/files/openssh.in	Thu Sep 24 21:54:40 2015	(r397771)
+++ head/security/openssh-portable-devel/files/openssh.in	Thu Sep 24 22:05:23 2015	(r397772)
@@ -35,8 +35,7 @@ pidfile=${openssh_pidfile:="/var/run/ssh
 
 openssh_keygen()
 {
-	if [ -f %%ETCDIR%%/ssh_host_key -a \
-	    -f %%ETCDIR%%/ssh_host_dsa_key -a \
+	if [ -f %%ETCDIR%%/ssh_host_dsa_key -a \
 	    -f %%ETCDIR%%/ssh_host_rsa_key -a \
 	    -f %%ETCDIR%%/ssh_host_ecdsa_key -a \
 	    -f %%ETCDIR%%/ssh_host_ed25519_key ]; then
@@ -49,15 +48,6 @@ openssh_keygen()
 	[ -x %%PREFIX%%/bin/ssh-keygen ] ||
 		err 1 "%%PREFIX%%/bin/ssh-keygen does not exist."
 
-	if [ -f %%ETCDIR%%/ssh_host_key ]; then
-		echo "You already have an RSA host key" \
-			"in %%ETCDIR%%/ssh_host_key"
-		echo "Skipping protocol version 1 RSA Key Generation"
-	else
-		%%PREFIX%%/bin/ssh-keygen -t rsa1 -b 1024 \
-			-f %%ETCDIR%%/ssh_host_key -N ''
-	fi
-
 	if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then
 		echo "You already have a DSA host key" \
 			"in %%ETCDIR%%/ssh_host_dsa_key"