RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

promote chacha20-poly1305@openssh.com to be the default
 cipher; ok markus
This commit is contained in:
djm@openbsd.org 2015-03-24 09:17:21 +00:00 committed by Damien Miller
parent 2aa9da1a3b
commit a22b9ef212
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
myproposal.h
View File

@ -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. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -61,7 +61,7 @@
#ifdef OPENSSL_HAVE_EVPGCM #ifdef OPENSSL_HAVE_EVPGCM
# define AESGCM_CIPHER_MODES \ # define AESGCM_CIPHER_MODES \
"aes128-gcm@openssh.com,aes256-gcm@openssh.com," ",aes128-gcm@openssh.com,aes256-gcm@openssh.com"
#else #else
# define AESGCM_CIPHER_MODES # define AESGCM_CIPHER_MODES
#endif #endif
@ -108,9 +108,9 @@
/* the actual algorithms */ /* the actual algorithms */
#define KEX_SERVER_ENCRYPT \ #define KEX_SERVER_ENCRYPT \
"aes128-ctr,aes192-ctr,aes256-ctr," \ "chacha20-poly1305@openssh.com," \
AESGCM_CIPHER_MODES \ "aes128-ctr,aes192-ctr,aes256-ctr" \
"chacha20-poly1305@openssh.com" AESGCM_CIPHER_MODES
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \ #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
"arcfour256,arcfour128," \ "arcfour256,arcfour128," \
@ -148,8 +148,8 @@
"ssh-ed25519-cert-v01@openssh.com," \ "ssh-ed25519-cert-v01@openssh.com," \
"ssh-ed25519" "ssh-ed25519"
#define KEX_SERVER_ENCRYPT \ #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 \ #define KEX_SERVER_MAC \
"umac-64-etm@openssh.com," \ "umac-64-etm@openssh.com," \
"umac-128-etm@openssh.com," \ "umac-128-etm@openssh.com," \