summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--myproposal.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/myproposal.h b/myproposal.h
index b266b52e1..bdd05966f 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.49 2015/12/05 20:53:21 markus Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.50 2016/02/09 05:30:04 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -113,9 +113,7 @@
113 AESGCM_CIPHER_MODES 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 "aes128-cbc,aes192-cbc,aes256-cbc,3des-cbc"
117 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
118 "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
119 117
120#define KEX_SERVER_MAC \ 118#define KEX_SERVER_MAC \
121 "umac-64-etm@openssh.com," \ 119 "umac-64-etm@openssh.com," \
@@ -129,18 +127,9 @@
129 "hmac-sha2-512," \ 127 "hmac-sha2-512," \
130 "hmac-sha1" 128 "hmac-sha1"
131 129
132#define KEX_CLIENT_MAC KEX_SERVER_MAC "," \ 130#define KEX_CLIENT_MAC KEX_SERVER_MAC
133 "hmac-md5-etm@openssh.com," \
134 "hmac-ripemd160-etm@openssh.com," \
135 "hmac-sha1-96-etm@openssh.com," \
136 "hmac-md5-96-etm@openssh.com," \
137 "hmac-md5," \
138 "hmac-ripemd160," \
139 "hmac-ripemd160@openssh.com," \
140 "hmac-sha1-96," \
141 "hmac-md5-96"
142 131
143#else 132#else /* WITH_OPENSSL */
144 133
145#define KEX_SERVER_KEX \ 134#define KEX_SERVER_KEX \
146 "curve25519-sha256@libssh.org" 135 "curve25519-sha256@libssh.org"