diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/myproposal.h b/myproposal.h index b35b2b8bd..403311095 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.41 2014/07/11 13:54:34 tedu Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.42 2015/03/24 09:17:21 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -61,7 +61,7 @@ | |||
61 | 61 | ||
62 | #ifdef OPENSSL_HAVE_EVPGCM | 62 | #ifdef OPENSSL_HAVE_EVPGCM |
63 | # define AESGCM_CIPHER_MODES \ | 63 | # define AESGCM_CIPHER_MODES \ |
64 | "aes128-gcm@openssh.com,aes256-gcm@openssh.com," | 64 | ",aes128-gcm@openssh.com,aes256-gcm@openssh.com" |
65 | #else | 65 | #else |
66 | # define AESGCM_CIPHER_MODES | 66 | # define AESGCM_CIPHER_MODES |
67 | #endif | 67 | #endif |
@@ -108,9 +108,9 @@ | |||
108 | /* the actual algorithms */ | 108 | /* the actual algorithms */ |
109 | 109 | ||
110 | #define KEX_SERVER_ENCRYPT \ | 110 | #define KEX_SERVER_ENCRYPT \ |
111 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 111 | "chacha20-poly1305@openssh.com," \ |
112 | AESGCM_CIPHER_MODES \ | 112 | "aes128-ctr,aes192-ctr,aes256-ctr" \ |
113 | "chacha20-poly1305@openssh.com" | 113 | AESGCM_CIPHER_MODES |
114 | 114 | ||
115 | #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \ | 115 | #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT "," \ |
116 | "arcfour256,arcfour128," \ | 116 | "arcfour256,arcfour128," \ |
@@ -148,8 +148,8 @@ | |||
148 | "ssh-ed25519-cert-v01@openssh.com," \ | 148 | "ssh-ed25519-cert-v01@openssh.com," \ |
149 | "ssh-ed25519" | 149 | "ssh-ed25519" |
150 | #define KEX_SERVER_ENCRYPT \ | 150 | #define KEX_SERVER_ENCRYPT \ |
151 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 151 | "chacha20-poly1305@openssh.com," |
152 | "chacha20-poly1305@openssh.com" | 152 | "aes128-ctr,aes192-ctr,aes256-ctr" |
153 | #define KEX_SERVER_MAC \ | 153 | #define KEX_SERVER_MAC \ |
154 | "umac-64-etm@openssh.com," \ | 154 | "umac-64-etm@openssh.com," \ |
155 | "umac-128-etm@openssh.com," \ | 155 | "umac-128-etm@openssh.com," \ |