summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-03-24 09:17:21 +0000
committerDamien Miller <djm@mindrot.org>2015-03-27 12:00:43 +1100
commita22b9ef21285e81775732436f7c84a27bd3f71e0 (patch)
treea5a4da3b21a9ef3aeff16841f97decef9ed462e1 /myproposal.h
parent2aa9da1a3b360cf7b13e96fe1521534b91501fb5 (diff)
upstream commit
promote chacha20-poly1305@openssh.com to be the default cipher; ok markus
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/myproposal.h b/myproposal.h
index b35b2b8b..40331109 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.41 2014/07/11 13:54:34 tedu Exp $ */
+/* $OpenBSD: myproposal.h,v 1.42 2015/03/24 09:17:21 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -61,7 +61,7 @@
#ifdef OPENSSL_HAVE_EVPGCM
# define AESGCM_CIPHER_MODES \
- "aes128-gcm@openssh.com,aes256-gcm@openssh.com,"
+ ",aes128-gcm@openssh.com,aes256-gcm@openssh.com"
#else
# define AESGCM_CIPHER_MODES
#endif
@@ -108,9 +108,9 @@
/* the actual algorithms */
#define KEX_SERVER_ENCRYPT \
- "aes128-ctr,aes192-ctr,aes256-ctr," \
- AESGCM_CIPHER_MODES \
- "chacha20-poly1305@openssh.com"
+ "chacha20-poly1305@openssh.com," \
+ "aes128-ctr,aes192-ctr,aes256-ctr" \
+ AESGCM_CIPHER_MODES
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
"arcfour256,arcfour128," \
@@ -148,8 +148,8 @@
"ssh-ed25519-cert-v01@openssh.com," \
"ssh-ed25519"
#define KEX_SERVER_ENCRYPT \
- "aes128-ctr,aes192-ctr,aes256-ctr," \
- "chacha20-poly1305@openssh.com"
+ "chacha20-poly1305@openssh.com,"
+ "aes128-ctr,aes192-ctr,aes256-ctr"
#define KEX_SERVER_MAC \
"umac-64-etm@openssh.com," \
"umac-128-etm@openssh.com," \