summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/kex.c b/kex.c
index 2dba1c56b..335b789fc 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.115 2015/12/13 22:42:23 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.116 2016/01/14 16:17:39 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -49,7 +49,6 @@
49#include "misc.h" 49#include "misc.h"
50#include "dispatch.h" 50#include "dispatch.h"
51#include "monitor.h" 51#include "monitor.h"
52#include "roaming.h"
53 52
54#include "ssherr.h" 53#include "ssherr.h"
55#include "sshbuf.h" 54#include "sshbuf.h"
@@ -748,17 +747,6 @@ kex_choose_conf(struct ssh *ssh)
748 sprop=peer; 747 sprop=peer;
749 } 748 }
750 749
751 /* Check whether server offers roaming */
752 if (!kex->server) {
753 char *roaming = match_list(KEX_RESUME,
754 peer[PROPOSAL_KEX_ALGS], NULL);
755
756 if (roaming) {
757 kex->roaming = 1;
758 free(roaming);
759 }
760 }
761
762 /* Check whether client supports ext_info_c */ 750 /* Check whether client supports ext_info_c */
763 if (kex->server) { 751 if (kex->server) {
764 char *ext; 752 char *ext;