diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-03-08 11:19:52 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2010-03-08 11:19:52 +0000 |
| commit | 6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4 (patch) | |
| tree | f3af5b582d9a7808774ea77df321abab26782ebf /kex.c | |
| parent | e5e752b5a70a672df97b5d7ca5c1e58c87a27234 (diff) | |
| download | src-6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4.tar.gz src-6d4f2dd11a26e3c2c7f4838f72cf07230d7678a4.zip | |
Vendor import of OpenSSH 5.4p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=204861
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.81 2009/05/27 06:34:36 andreas Exp $ */ +/* $OpenBSD: kex.c,v 1.82 2009/10/24 11:13:54 andreas Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -48,6 +48,7 @@ #include "match.h" #include "dispatch.h" #include "monitor.h" +#include "roaming.h" #if OPENSSL_VERSION_NUMBER >= 0x00907000L # if defined(HAVE_EVP_SHA256) @@ -386,6 +387,16 @@ kex_choose_conf(Kex *kex) sprop=peer; } + /* Check whether server offers roaming */ + if (!kex->server) { + char *roaming; + roaming = match_list(KEX_RESUME, peer[PROPOSAL_KEX_ALGS], NULL); + if (roaming) { + kex->roaming = 1; + xfree(roaming); + } + } + /* Algorithm Negotiation */ for (mode = 0; mode < MODE_MAX; mode++) { newkeys = xcalloc(1, sizeof(*newkeys)); |