diff options
| author | Damien Miller <djm@mindrot.org> | 2006-03-15 12:08:28 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-03-15 12:08:28 +1100 |
| commit | a63128d1a8a4077bc992e09d00e2683d1592e500 (patch) | |
| tree | d202bbd39fd539ff7173b196df0286636af49f2b /myproposal.h | |
| parent | cc3e8ba3c24357b912dd7071ba34ab863de593bd (diff) | |
- 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 'myproposal.h')
| -rw-r--r-- | myproposal.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h index d8cba1ca..cc94a8ed 100644 --- a/myproposal.h +++ b/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," \ |