tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2014-07-17 09:52:07 +10:00
parent 9d69d937b4
commit 6262d760e0
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -7,6 +7,10 @@
Permit use of SYS_sendsyslog from inside the sandbox. Clock is ticking, Permit use of SYS_sendsyslog from inside the sandbox. Clock is ticking,
update your kernels and sshd soon.. libc will start using sendsyslog() update your kernels and sshd soon.. libc will start using sendsyslog()
in about 4 days. 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 20140715
- (djm) [configure.ac] Delay checks for arc4random* until after libcrypto - (djm) [configure.ac] Delay checks for arc4random* until after libcrypto

16
myproposal.h
View File

@ -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. * Copyright (c) 2000 Markus Friedl. All rights reserved.
@ -122,19 +122,19 @@
"umac-128-etm@openssh.com," \ "umac-128-etm@openssh.com," \
"hmac-sha2-256-etm@openssh.com," \ "hmac-sha2-256-etm@openssh.com," \
"hmac-sha2-512-etm@openssh.com," \ "hmac-sha2-512-etm@openssh.com," \
"hmac-sha1-etm@openssh.com," \
"umac-64@openssh.com," \ "umac-64@openssh.com," \
"umac-128@openssh.com," \ "umac-128@openssh.com," \
"hmac-sha2-256," \ "hmac-sha2-256," \
"hmac-sha2-512" "hmac-sha2-512," \
"hmac-sha1"
#define KEX_CLIENT_MAC KEX_SERVER_MAC "," \ #define KEX_CLIENT_MAC KEX_SERVER_MAC "," \
"hmac-md5-etm@openssh.com," \ "hmac-md5-etm@openssh.com," \
"hmac-sha1-etm@openssh.com," \
"hmac-ripemd160-etm@openssh.com," \ "hmac-ripemd160-etm@openssh.com," \
"hmac-sha1-96-etm@openssh.com," \ "hmac-sha1-96-etm@openssh.com," \
"hmac-md5-96-etm@openssh.com," \ "hmac-md5-96-etm@openssh.com," \
"hmac-md5," \ "hmac-md5," \
"hmac-sha1," \
"hmac-ripemd160," \ "hmac-ripemd160," \
"hmac-ripemd160@openssh.com," \ "hmac-ripemd160@openssh.com," \
"hmac-sha1-96," \ "hmac-sha1-96," \
@ -155,16 +155,16 @@
"umac-128-etm@openssh.com," \ "umac-128-etm@openssh.com," \
"hmac-sha2-256-etm@openssh.com," \ "hmac-sha2-256-etm@openssh.com," \
"hmac-sha2-512-etm@openssh.com," \ "hmac-sha2-512-etm@openssh.com," \
"hmac-sha1-etm@openssh.com," \
"umac-64@openssh.com," \ "umac-64@openssh.com," \
"umac-128@openssh.com," \ "umac-128@openssh.com," \
"hmac-sha2-256," \ "hmac-sha2-256," \
"hmac-sha2-512" "hmac-sha2-512," \
"hmac-sha1"
#define KEX_CLIENT_KEX KEX_SERVER_KEX #define KEX_CLIENT_KEX KEX_SERVER_KEX
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
#define KEX_CLIENT_MAC KEX_SERVER_MAC "," \ #define KEX_CLIENT_MAC KEX_SERVER_MAC
"hmac-sha1-etm@openssh.com," \
"hmac-sha1"
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */