[openssh-commits] [openssh] 03/12: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit a22b9ef21285e81775732436f7c84a27bd3f71e0
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Mar 24 09:17:21 2015 +0000

    upstream commit
    
    promote chacha20-poly1305 at openssh.com to be the default
     cipher; ok markus
---
 myproposal.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/myproposal.h b/myproposal.h
index b35b2b8..4033110 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 at openssh.com,aes256-gcm at openssh.com,"
+	",aes128-gcm at openssh.com,aes256-gcm at 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 at openssh.com"
+	"chacha20-poly1305 at 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 at openssh.com," \
 	"ssh-ed25519"
 #define	KEX_SERVER_ENCRYPT \
-	"aes128-ctr,aes192-ctr,aes256-ctr," \
-	"chacha20-poly1305 at openssh.com"
+	"chacha20-poly1305 at openssh.com,"
+	"aes128-ctr,aes192-ctr,aes256-ctr"
 #define	KEX_SERVER_MAC \
 	"umac-64-etm at openssh.com," \
 	"umac-128-etm at openssh.com," \

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.