diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-11 13:54:35 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-11 13:54:35 +0000 |
| commit | 1fae1d99f0ecbce53075dd82aa178a564f6084ef (patch) | |
| tree | 9ac0e52d4e73461afa6dd2b9022b7c38890ed41f /usr.bin | |
| parent | 5c123c78aec78df10337d8b0c2370df10d2e2d31 (diff) | |
by popular demand, add back hamc-sha1 to server proposal for better compat
with many clients still in use. ok deraadt
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index 711588af423..fb848c6705d 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.40 2014/04/30 19:07:48 naddy Exp $ */ +/* $OpenBSD: myproposal.h,v 1.41 2014/07/11 13:54:34 tedu Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -69,19 +69,19 @@ "umac-128-etm@openssh.com," \ "hmac-sha2-256-etm@openssh.com," \ "hmac-sha2-512-etm@openssh.com," \ + "hmac-sha1-etm@openssh.com," \ "umac-64@openssh.com," \ "umac-128@openssh.com," \ "hmac-sha2-256," \ - "hmac-sha2-512" \ + "hmac-sha2-512," \ + "hmac-sha1" #define KEX_CLIENT_MAC KEX_SERVER_MAC "," \ "hmac-md5-etm@openssh.com," \ - "hmac-sha1-etm@openssh.com," \ "hmac-ripemd160-etm@openssh.com," \ "hmac-sha1-96-etm@openssh.com," \ "hmac-md5-96-etm@openssh.com," \ "hmac-md5," \ - "hmac-sha1," \ "hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ "hmac-sha1-96," \ @@ -102,16 +102,16 @@ "umac-128-etm@openssh.com," \ "hmac-sha2-256-etm@openssh.com," \ "hmac-sha2-512-etm@openssh.com," \ + "hmac-sha1-etm@openssh.com," \ "umac-64@openssh.com," \ "umac-128@openssh.com," \ "hmac-sha2-256," \ - "hmac-sha2-512" + "hmac-sha2-512," \ + "hmac-sha1" #define KEX_CLIENT_KEX KEX_SERVER_KEX #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT -#define KEX_CLIENT_MAC KEX_SERVER_MAC "," \ - "hmac-sha1-etm@openssh.com," \ - "hmac-sha1" +#define KEX_CLIENT_MAC KEX_SERVER_MAC #endif /* WITH_OPENSSL */ |