summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-17 09:52:07 +1000
committerDamien Miller <djm@mindrot.org>2014-07-17 09:52:07 +1000
commit6262d760e00714523633bd989d62e273a3dca99a (patch)
treefb2f44c4a661d554895ef99f5cab196fa2204f44
parent9d69d937b46ecba17f16d923e538ceda7b705c7a (diff)
- tedu@cvs.openbsd.org 2014/07/11 13:54:34
[myproposal.h] by popular demand, add back hamc-sha1 to server proposal for better compat with many clients still in use. ok deraadt
-rw-r--r--ChangeLog4
-rw-r--r--myproposal.h16
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9721794b..d133c5b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
Permit use of SYS_sendsyslog from inside the sandbox. Clock is ticking,
update your kernels and sshd soon.. libc will start using sendsyslog()
in about 4 days.
+ - tedu@cvs.openbsd.org 2014/07/11 13:54:34
+ [myproposal.h]
+ by popular demand, add back hamc-sha1 to server proposal for better compat
+ with many clients still in use. ok deraadt
20140715
- (djm) [configure.ac] Delay checks for arc4random* until after libcrypto
diff --git a/myproposal.h b/myproposal.h
index d4298899..32d0f14b 100644
--- a/myproposal.h
+++ b/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.
@@ -122,19 +122,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," \
@@ -155,16 +155,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 */