From owner-svn-src-all@freebsd.org Thu Jan 14 22:45:35 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74638A82DFE; Thu, 14 Jan 2016 22:45:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B57C1563; Thu, 14 Jan 2016 22:45:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EMjYOA076210; Thu, 14 Jan 2016 22:45:34 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EMjXiU076207; Thu, 14 Jan 2016 22:45:33 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201601142245.u0EMjXiU076207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 14 Jan 2016 22:45:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r294050 - in releng/10.2: . crypto/openssh sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2016 22:45:35 -0000 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