summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-04 08:26:52 +1100
committerDamien Miller <djm@mindrot.org>2013-11-04 08:26:52 +1100
commit1e1242604eb0fd510fe93f81245c529237ffc513 (patch)
treed15eb5e9442cd3d812d6ade20775864f1600825a /myproposal.h
parentd2252c79191d069372ed6effce7c7a2de93448cd (diff)
- markus@cvs.openbsd.org 2013/11/02 21:59:15
[kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c] use curve25519 for default key exchange (curve25519-sha256@libssh.org); initial patch from Aris Adamantiadis; ok djm@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h
index 4e913e3c..0820749a 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: myproposal.h,v 1.33 2013/11/02 21:59:15 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -66,6 +66,7 @@
#endif
# define KEX_DEFAULT_KEX \
+ "curve25519-sha256@libssh.org," \
KEX_ECDH_METHODS \
KEX_SHA256_METHODS \
"diffie-hellman-group-exchange-sha1," \