[src/netbsd-7-0]: src/crypto/external/bsd/openssh/dist Pull up following revi...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/687c0b652fc5
branches:  netbsd-7-0
changeset: 801134:687c0b652fc5
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Feb 22 11:24:18 2016 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1075):
        crypto/external/bsd/openssh/dist/readconf.c: patch
        crypto/external/bsd/openssh/dist/ssh.c: patch
Fix CVE CVE-2016-0777 by disabling roaming completely.

diffstat:

 crypto/external/bsd/openssh/dist/readconf.c |  9 ++++-----
 crypto/external/bsd/openssh/dist/ssh.c      |  7 ++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r ea5ade4ea1a0 -r 687c0b652fc5 crypto/external/bsd/openssh/dist/readconf.c
--- a/crypto/external/bsd/openssh/dist/readconf.c       Thu Feb 11 23:13:25 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/readconf.c       Mon Feb 22 11:24:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $    */
+/*     $NetBSD: readconf.c,v 1.11.4.1.2.1 2016/02/22 11:24:18 snj Exp $        */
 /* $OpenBSD: readconf.c,v 1.232 2015/02/16 22:13:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.11.4.1.2.1 2016/02/22 11:24:18 snj Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -1745,7 +1745,7 @@
        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;
@@ -1960,8 +1960,7 @@
                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 -r ea5ade4ea1a0 -r 687c0b652fc5 crypto/external/bsd/openssh/dist/ssh.c
--- a/crypto/external/bsd/openssh/dist/ssh.c    Thu Feb 11 23:13:25 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh.c    Mon Feb 22 11:24:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $ */
+/*     $NetBSD: ssh.c,v 1.14.4.1.2.1 2016/02/22 11:24:18 snj Exp $     */
 /* $OpenBSD: ssh.c,v 1.416 2015/03/03 06:48:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: ssh.c,v 1.14.4.1.2.1 2016/02/22 11:24:18 snj Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -1963,9 +1963,6 @@
                        fork_postauth();
        }
 
-       if (options.use_roaming)
-               request_roaming();
-
        return client_loop(tty_flag, tty_flag ?
            options.escape_char : SSH_ESCAPECHAR_NONE, id);
 }