summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-01-14 16:17:39 +0000
committerDamien Miller <djm@mindrot.org>2016-01-27 16:54:10 +1100
commita306863831c57ec5fad918687cc5d289ee8e2635 (patch)
tree0321a74bc4a9be03ad303d35306555ca0908ee25 /kex.h
parent6ef49e83e30688504552ac10875feabd5521565f (diff)
downloadopenssh-git-a306863831c57ec5fad918687cc5d289ee8e2635.tar.gz
upstream commit
remove roaming support; ok djm@ Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/kex.h b/kex.h
index 25ccf2e0..24d4aa15 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.74 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.75 2016/01/14 16:17:39 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -54,7 +54,6 @@
#define KEX_DH14 "diffie-hellman-group14-sha1"
#define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1"
#define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256"
-#define KEX_RESUME "resume@appgate.com"
#define KEX_ECDH_SHA2_NISTP256 "ecdh-sha2-nistp256"
#define KEX_ECDH_SHA2_NISTP384 "ecdh-sha2-nistp384"
#define KEX_ECDH_SHA2_NISTP521 "ecdh-sha2-nistp521"
@@ -133,7 +132,6 @@ struct kex {
int hostkey_type;
int hostkey_nid;
u_int kex_type;
- int roaming;
int rsa_sha2;
int ext_info_c;
struct sshbuf *my;