summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2006-03-07 09:07:41 +0000
committerDamien Miller <djm@cvs.openbsd.org>2006-03-07 09:07:41 +0000
commit4748e1326bde49431d92564fe844c574d7c2072d (patch)
tree6590e3dcde5a80f3688af8b9dfdeceb6fc5443a4 /usr.bin/ssh/kex.h
parentd2d46488e5d7f1c8ba18bbc0483f69fbe2cb8994 (diff)
Implement the diffie-hellman-group-exchange-sha256 key exchange method
using the SHA256 code in libc (and wrapper to make it into an OpenSSL EVP), interop tested against CVS PuTTY
Diffstat (limited to 'usr.bin/ssh/kex.h')
-rw-r--r--usr.bin/ssh/kex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h
index bbd931e049d..e2ba0a98fa4 100644
--- a/usr.bin/ssh/kex.h
+++ b/usr.bin/ssh/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.39 2006/03/07 09:07:40 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -34,6 +34,7 @@
#define KEX_DH1 "diffie-hellman-group1-sha1"
#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 COMP_NONE 0
#define COMP_ZLIB 1
@@ -63,6 +64,7 @@ enum kex_exchange {
KEX_DH_GRP1_SHA1,
KEX_DH_GRP14_SHA1,
KEX_DH_GEX_SHA1,
+ KEX_DH_GEX_SHA256,
KEX_MAX
};