summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorjsg@openbsd.org <jsg@openbsd.org>2015-04-21 07:01:00 +0000
committerDamien Miller <djm@mindrot.org>2015-04-29 18:14:21 +1000
commit39bfbf7caad231cc4bda6909fb1af0705bca04d8 (patch)
tree1c43e4f2724d21d362b07f8f55d1e94d8a535228 /myproposal.h
parent6b0d576bb87eca3efd2b309fcfe4edfefc289f9c (diff)
upstream commit
Add back a backslash removed in rev 1.42 so KEX_SERVER_ENCRYPT will include aes again. ok deraadt@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h
index 40331109..c397553a 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," \