summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/myproposal.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/myproposal.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/myproposal.h')
-rw-r--r--usr.bin/ssh/myproposal.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h
index d8cba1caf81..cc94a8ed2b4 100644
--- a/usr.bin/ssh/myproposal.h
+++ b/usr.bin/ssh/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.18 2005/07/25 11:59:39 markus Exp $ */
+/* $OpenBSD: myproposal.h,v 1.19 2006/03/07 09:07:40 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -23,9 +23,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \
- "diffie-hellman-group14-sha1," \
- "diffie-hellman-group1-sha1"
+#define KEX_DEFAULT_KEX \
+ "diffie-hellman-group-exchange-sha256," \
+ "diffie-hellman-group-exchange-sha1," \
+ "diffie-hellman-group14-sha1," \
+ "diffie-hellman-group1-sha1"
#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"
#define KEX_DEFAULT_ENCRYPT \
"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \