summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-01-14 22:47:54 +0000
committerglebius <glebius@FreeBSD.org>2016-01-14 22:47:54 +0000
commit081d2796398eccde663726fb1d7073ada3146548 (patch)
tree06a091b5121a5a22a95f41572a171849284ccbad
parent5af8834e70ae2dde58ee682e1a3e9c6998d9a683 (diff)
downloadFreeBSD-src-081d2796398eccde663726fb1d7073ada3146548.zip
FreeBSD-src-081d2796398eccde663726fb1d7073ada3146548.tar.gz
Fix OpenSSH client information leak.
Security: SA-16:07.openssh Security: CVE-2016-0777 Approved by: so
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssh/readconf.c5
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 7 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 1d41ddc..41479cd 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20160114 p27 FreeBSD-SA-16:07.openssh
+
+ Fix OpenSSH client information leak. [SA-16:07]
+
20160114 p26 FreeBSD-EN-16:02.pf
FreeBSD-EN-16:03.yplib
FreeBSD-SA-16:01.sctp
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 9145b46..16f62fe 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -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)
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 00e08fc..7b3be89 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.1"
-BRANCH="RELEASE-p26"
+BRANCH="RELEASE-p27"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud