diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-03 22:26:52 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-03 22:26:52 +0100 |
| commit | 1e1242604eb0fd510fe93f81245c529237ffc513 (patch) | |
| tree | d15eb5e9442cd3d812d6ade20775864f1600825a /myproposal.h | |
| parent | - markus@cvs.openbsd.org 2013/11/02 20:03:54 (diff) | |
| download | openssh-1e1242604eb0fd510fe93f81245c529237ffc513.tar.xz openssh-1e1242604eb0fd510fe93f81245c529237ffc513.zip | |
- 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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 4e913e3ce..0820749a8 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," \ |