diff options
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.81 2009/05/27 06:34:36 andreas Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.82 2009/10/24 11:13:54 andreas 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 | * |
@@ -48,6 +48,7 @@ | |||
48 | #include "match.h" | 48 | #include "match.h" |
49 | #include "dispatch.h" | 49 | #include "dispatch.h" |
50 | #include "monitor.h" | 50 | #include "monitor.h" |
51 | #include "roaming.h" | ||
51 | 52 | ||
52 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L | 53 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L |
53 | # if defined(HAVE_EVP_SHA256) | 54 | # if defined(HAVE_EVP_SHA256) |
@@ -386,6 +387,16 @@ kex_choose_conf(Kex *kex) | |||
386 | sprop=peer; | 387 | sprop=peer; |
387 | } | 388 | } |
388 | 389 | ||
390 | /* Check whether server offers roaming */ | ||
391 | if (!kex->server) { | ||
392 | char *roaming; | ||
393 | roaming = match_list(KEX_RESUME, peer[PROPOSAL_KEX_ALGS], NULL); | ||
394 | if (roaming) { | ||
395 | kex->roaming = 1; | ||
396 | xfree(roaming); | ||
397 | } | ||
398 | } | ||
399 | |||
389 | /* Algorithm Negotiation */ | 400 | /* Algorithm Negotiation */ |
390 | for (mode = 0; mode < MODE_MAX; mode++) { | 401 | for (mode = 0; mode < MODE_MAX; mode++) { |
391 | newkeys = xcalloc(1, sizeof(*newkeys)); | 402 | newkeys = xcalloc(1, sizeof(*newkeys)); |