summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-08 01:13:42 +0200
committerDamien Miller <djm@mindrot.org>2017-05-08 01:21:11 +0200
commit70c1218fc45757a030285051eb4d209403f54785 (patch)
tree4cc99beaf08331993145fddeebb1b196bbadd295
parentupstream commit (diff)
downloadopenssh-70c1218fc45757a030285051eb4d209403f54785.tar.xz
openssh-70c1218fc45757a030285051eb4d209403f54785.zip
upstream commit
Don't offer CBC ciphers by default in the client. ok markus@ Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef
-rw-r--r--myproposal.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h
index 072e36ec7..c255147aa 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.54 2016/09/28 16:33:07 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.55 2017/05/07 23:13:42 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -121,8 +121,7 @@
"aes128-ctr,aes192-ctr,aes256-ctr" \
AESGCM_CIPHER_MODES
-#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \
- "aes128-cbc,aes192-cbc,aes256-cbc"
+#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
#define KEX_SERVER_MAC \
"umac-64-etm@openssh.com," \