Mailing List Archive

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

djm pushed a commit to branch master
in repository openssh.

commit 39bfbf7caad231cc4bda6909fb1af0705bca04d8
Author: jsg@openbsd.org <jsg@openbsd.org>
Date: Tue Apr 21 07:01:00 2015 +0000

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 4033110..c397553 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," \

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits