From c78a187b1776cb45c07a4a138946f8370ed6e71d Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 6 Mar 2001 01:06:58 +0000 Subject: - deraadt@cvs.openbsd.org 2001/03/05 16:07:15 [sshd.8] detail default hmac setup too --- ChangeLog | 5 ++++- sshd.8 | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c1f8738b..7a1c09426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ [myproposal.h ssh.1] switch to aes128-cbc/hmac-md5 by default in SSH2 -- faster; provos & markus ok + - deraadt@cvs.openbsd.org 2001/03/05 16:07:15 + [sshd.8] + detail default hmac setup too 20010305 - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch] @@ -4381,4 +4384,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.911 2001/03/06 01:05:23 mouring Exp $ +$Id: ChangeLog,v 1.912 2001/03/06 01:06:58 mouring Exp $ diff --git a/sshd.8 b/sshd.8 index c924a438f..30e51b76a 100644 --- a/sshd.8 +++ b/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.104 2001/03/05 14:28:47 deraadt Exp $ +.\" $OpenBSD: sshd.8,v 1.105 2001/03/05 16:07:15 deraadt Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -352,7 +352,7 @@ The default is Specifies the ciphers allowed for protocol version 2. Multiple ciphers must be comma-separated. The default is -.Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . +.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. .It Cm CheckMail Specifies whether .Nm @@ -514,7 +514,7 @@ Multiple algorithms must be comma-separated. The default is .Pp .Bd -literal - ``hmac-sha1,hmac-md5,hmac-ripemd160,hmac-ripemd160@openssh.com, + ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com, hmac-sha1-96,hmac-md5-96'' .Ed .It Cm MaxStartups -- cgit v1.2.3