summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-05-07 23:13:43 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-05-07 23:13:43 +0000
commit85b4857690527c0abed7955aaf2f832aed52cd05 (patch)
tree55a1679f403e486bc01642a5bea774f381aa1f22 /usr.bin/ssh
parentcb018a8d67cec32f9b2113e92182b43108b3c34c (diff)
Don't offer CBC ciphers by default in the client. ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/myproposal.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h
index 908dd463ce9..242c26ffd25 100644
--- a/usr.bin/ssh/myproposal.h
+++ b/usr.bin/ssh/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.
@@ -64,8 +64,7 @@
"aes128-ctr,aes192-ctr,aes256-ctr," \
"aes128-gcm@openssh.com,aes256-gcm@openssh.com"
-#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," \