aboutsummaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 597090164442..072e36ec7b5e 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.50 2016/02/09 05:30:04 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.54 2016/09/28 16:33:07 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -84,7 +84,9 @@
#ifdef WITH_OPENSSL
# ifdef HAVE_EVP_SHA256
-# define KEX_CURVE25519_METHODS "curve25519-sha256@libssh.org,"
+# define KEX_CURVE25519_METHODS \
+ "curve25519-sha256," \
+ "curve25519-sha256@libssh.org,"
# else
# define KEX_CURVE25519_METHODS ""
# endif
@@ -120,7 +122,7 @@
AESGCM_CIPHER_MODES
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
- "aes128-cbc,aes192-cbc,aes256-cbc,3des-cbc"
+ "aes128-cbc,aes192-cbc,aes256-cbc"
#define KEX_SERVER_MAC \
"umac-64-etm@openssh.com," \
@@ -139,6 +141,7 @@
#else /* WITH_OPENSSL */
#define KEX_SERVER_KEX \
+ "curve25519-sha256," \
"curve25519-sha256@libssh.org"
#define KEX_DEFAULT_PK_ALG \
"ssh-ed25519-cert-v01@openssh.com," \
@@ -164,7 +167,7 @@
#endif /* WITH_OPENSSL */
-#define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib"
+#define KEX_DEFAULT_COMP "none,zlib@openssh.com"
#define KEX_DEFAULT_LANG ""
#define KEX_CLIENT \