diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2016-01-14 17:17:39 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-01-27 06:54:10 +0100 |
| commit | a306863831c57ec5fad918687cc5d289ee8e2635 (patch) | |
| tree | 0321a74bc4a9be03ad303d35306555ca0908ee25 /kex.c | |
| parent | upstream commit (diff) | |
| download | openssh-a306863831c57ec5fad918687cc5d289ee8e2635.tar.xz openssh-a306863831c57ec5fad918687cc5d289ee8e2635.zip | |
upstream commit
remove roaming support; ok djm@
Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.115 2015/12/13 22:42:23 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.116 2016/01/14 16:17:39 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -49,7 +49,6 @@ #include "misc.h" #include "dispatch.h" #include "monitor.h" -#include "roaming.h" #include "ssherr.h" #include "sshbuf.h" @@ -748,17 +747,6 @@ kex_choose_conf(struct ssh *ssh) sprop=peer; } - /* Check whether server offers roaming */ - if (!kex->server) { - char *roaming = match_list(KEX_RESUME, - peer[PROPOSAL_KEX_ALGS], NULL); - - if (roaming) { - kex->roaming = 1; - free(roaming); - } - } - /* Check whether client supports ext_info_c */ if (kex->server) { char *ext; |