tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Add back a backslash removed in rev 1.42 so
 KEX_SERVER_ENCRYPT will include aes again.

ok deraadt@
This commit is contained in:
jsg@openbsd.org 2015-04-21 07:01:00 +00:00 committed by Damien Miller
parent 6b0d576bb8
commit 39bfbf7caa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myproposal.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: myproposal.h,v 1.42 2015/03/24 09:17:21 djm Exp $ */ /* $OpenBSD: myproposal.h,v 1.43 2015/04/21 07:01:00 jsg Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -148,7 +148,7 @@
"ssh-ed25519-cert-v01@openssh.com," \ "ssh-ed25519-cert-v01@openssh.com," \
"ssh-ed25519" "ssh-ed25519"
#define KEX_SERVER_ENCRYPT \ #define KEX_SERVER_ENCRYPT \
"chacha20-poly1305@openssh.com," "chacha20-poly1305@openssh.com," \
"aes128-ctr,aes192-ctr,aes256-ctr" "aes128-ctr,aes192-ctr,aes256-ctr"
#define KEX_SERVER_MAC \ #define KEX_SERVER_MAC \
"umac-64-etm@openssh.com," \ "umac-64-etm@openssh.com," \