summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 12:08:28 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 12:08:28 +1100
commita63128d1a8a4077bc992e09d00e2683d1592e500 (patch)
treed202bbd39fd539ff7173b196df0286636af49f2b /kex.h
parentcc3e8ba3c24357b912dd7071ba34ab863de593bd (diff)
downloadopenssh-git-a63128d1a8a4077bc992e09d00e2683d1592e500.tar.gz
- djm@cvs.openbsd.org 2006/03/07 09:07:40
[kex.c kex.h monitor.c myproposal.h ssh-keyscan.c sshconnect2.c sshd.c] 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 NB. no portability bits committed yet
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index bbd931e0..e2ba0a98 100644
--- a/kex.h
+++ b/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
};