diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-05-07 23:13:42 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:21:11 +1000 |
| commit | 70c1218fc45757a030285051eb4d209403f54785 (patch) | |
| tree | 4cc99beaf08331993145fddeebb1b196bbadd295 /myproposal.h | |
| parent | acaf34fd823235d549c633c0146ee03ac5956e82 (diff) | |
upstream commit
Don't offer CBC ciphers by default in the client. ok
markus@
Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 5 |
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 @@ | |||
| 1 | /* $OpenBSD: myproposal.h,v 1.54 2016/09/28 16:33:07 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.55 2017/05/07 23:13:42 djm Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
| @@ -121,8 +121,7 @@ | |||
| 121 | "aes128-ctr,aes192-ctr,aes256-ctr" \ | 121 | "aes128-ctr,aes192-ctr,aes256-ctr" \ |
| 122 | AESGCM_CIPHER_MODES | 122 | AESGCM_CIPHER_MODES |
| 123 | 123 | ||
| 124 | #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \ | 124 | #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT |
| 125 | "aes128-cbc,aes192-cbc,aes256-cbc" | ||
| 126 | 125 | ||
| 127 | #define KEX_SERVER_MAC \ | 126 | #define KEX_SERVER_MAC \ |
| 128 | "umac-64-etm@openssh.com," \ | 127 | "umac-64-etm@openssh.com," \ |