--- a/components/openssh/Makefile	Thu Jan 21 13:49:37 2016 -0800
+++ b/components/openssh/Makefile	Fri Jan 22 00:45:23 2016 -0800
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openssh
-COMPONENT_VERSION=	7.1p1
+COMPONENT_VERSION=	7.1p2
 HUMAN_VERSION=		$(COMPONENT_VERSION)
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 
@@ -34,11 +34,11 @@
 
 COMPONENT_PROJECT_URL=	http://www.openssh.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428
+COMPONENT_ARCHIVE_HASH=	sha256:dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd
 COMPONENT_ARCHIVE_URL=	http://mirror.team-cymru.org/pub/OpenBSD/OpenSSH/portable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=utility/openssh
 
-TPNO_OPENSSH=		24282
+TPNO_OPENSSH=		26419
 TPNO_GSSKEX=		20377
 
 include $(WS_MAKE_RULES)/prep.mk

--- a/components/openssh/patches/035-disable_roaming.patch	Thu Jan 21 13:49:37 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# This is to fix two vulnerabilities in experimental client roaming code.
-#
-# CVE numbers CVE-2016-0777 and CVE-2016-0778 have been reserved
-# for these problems, but not officially issued yet. This fix came from
-# OpenSSH upstream and will be included in future OpenSSH 7.1p2 release.
-# The fix completely disables roaming on the client.
-#
-# When we upgrade OpenSSH to 7.1p2 or higher in the future, we will remove
-# this patch.
-#
-diff -pur old/readconf.c new/readconf.c
---- old/readconf.c
-+++ new/readconf.c
[email protected]@ -1716,7 +1716,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;
[email protected]@ -1908,8 +1908,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)