From 39bfbf7caad231cc4bda6909fb1af0705bca04d8 Mon Sep 17 00:00:00 2001 From: "jsg@openbsd.org" Date: Tue, 21 Apr 2015 07:01:00 +0000 Subject: upstream commit Add back a backslash removed in rev 1.42 so KEX_SERVER_ENCRYPT will include aes again. ok deraadt@ --- myproposal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/myproposal.h b/myproposal.h index 403311095..c397553a4 100644 --- a/myproposal.h +++ b/myproposal.h @@ -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. @@ -148,7 +148,7 @@ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-ed25519" #define KEX_SERVER_ENCRYPT \ - "chacha20-poly1305@openssh.com," + "chacha20-poly1305@openssh.com," \ "aes128-ctr,aes192-ctr,aes256-ctr" #define KEX_SERVER_MAC \ "umac-64-etm@openssh.com," \ -- cgit v1.2.3