svn commit: r294050 - in releng/10.2: . crypto/openssh sys/conf

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan 14 22:45:33 2016
New Revision: 294050
URL: https://svnweb.freebsd.org/changeset/base/294050

Log:
  Fix OpenSSH client information leak.
  
  Security:       SA-16:07.openssh
  Security:       CVE-2016-0777
  Approved by:	so

Modified:
  releng/10.2/UPDATING
  releng/10.2/crypto/openssh/readconf.c
  releng/10.2/sys/conf/newvers.sh
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/UPDATING
==============================================================================
--- releng/10.2/UPDATING	Thu Jan 14 22:42:43 2016	(r294049)
+++ releng/10.2/UPDATING	Thu Jan 14 22:45:33 2016	(r294050)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20160114	p10	FreeBSD-EN-16:07.openssh
+
+	Fix OpenSSH client information leak. [SA-16:07]
+
 20160114	p9	FreeBSD-EN-16:01.filemon
 			FreeBSD-EN-16:02.pf
 			FreeBSD-EN-16:03.yplib

Modified: releng/10.2/crypto/openssh/readconf.c
==============================================================================
--- releng/10.2/crypto/openssh/readconf.c	Thu Jan 14 22:42:43 2016	(r294049)
+++ releng/10.2/crypto/openssh/readconf.c	Thu Jan 14 22:45:33 2016	(r294050)
@@ -1643,7 +1643,7 @@ initialize_options(Options * options)
 	options->tun_remote = -1;
 	options->local_command = NULL;
 	options->permit_local_command = -1;
-	options->use_roaming = -1;
+	options->use_roaming = 0;
 	options->visual_host_key = -1;
 	options->ip_qos_interactive = -1;
 	options->ip_qos_bulk = -1;
@@ -1825,8 +1825,7 @@ fill_default_options(Options * options)
 		options->tun_remote = SSH_TUNID_ANY;
 	if (options->permit_local_command == -1)
 		options->permit_local_command = 0;
-	if (options->use_roaming == -1)
-		options->use_roaming = 1;
+	options->use_roaming = 0;
 	if (options->visual_host_key == -1)
 		options->visual_host_key = 0;
 	if (options->ip_qos_interactive == -1)

Modified: releng/10.2/sys/conf/newvers.sh
==============================================================================
--- releng/10.2/sys/conf/newvers.sh	Thu Jan 14 22:42:43 2016	(r294049)
+++ releng/10.2/sys/conf/newvers.sh	Thu Jan 14 22:45:33 2016	(r294050)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.2"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi