Module Name: src
Committed By: tron
Date: Thu Apr 29 17:56:53 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh_config ssh_config.5
sshd_config.5
Log Message:
Don't mention "umac...@openssh.com" MAC algorithm which is not enabled
in our SSH client and daemon as it causes crashes on architectures which
strict aligment requirements (e.g. NetBSD/sparc64).
This fixes PR bin/43221 by myself.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssh_config \
src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/sshd_config.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh_config
diff -u src/crypto/external/bsd/openssh/dist/ssh_config:1.2 src/crypto/external/bsd/openssh/dist/ssh_config:1.3
--- src/crypto/external/bsd/openssh/dist/ssh_config:1.2 Sun Jun 7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/ssh_config Thu Apr 29 17:56:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ssh_config,v 1.2 2009/06/07 22:38:47 christos Exp $
+# $NetBSD: ssh_config,v 1.3 2010/04/29 17:56:53 tron Exp $
# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $
# This is the ssh client system-wide configuration file. See
@@ -39,7 +39,7 @@
# Protocol 2,1
# Cipher 3des
# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
-# MACs hmac-md5,hmac-sha1,umac...@openssh.com,hmac-ripemd160
+# MACs hmac-md5,hmac-sha1,hmac-ripemd160
# EscapeChar ~
# Tunnel no
# TunnelDevice any:any
Index: src/crypto/external/bsd/openssh/dist/ssh_config.5
diff -u src/crypto/external/bsd/openssh/dist/ssh_config.5:1.2 src/crypto/external/bsd/openssh/dist/ssh_config.5:1.3
--- src/crypto/external/bsd/openssh/dist/ssh_config.5:1.2 Sun Jun 7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/ssh_config.5 Thu Apr 29 17:56:53 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: ssh_config.5,v 1.2 2009/06/07 22:38:47 christos Exp $
+.\" $NetBSD: ssh_config.5,v 1.3 2010/04/29 17:56:53 tron Exp $
.\" -*- nroff -*-
.\"
.\" Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -667,7 +667,7 @@
Multiple algorithms must be comma-separated.
The default is:
.Bd -literal -offset indent
-hmac-md5,hmac-sha1,umac...@openssh.com,
+hmac-md5,hmac-sha1,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96
.Ed
.It Cm NoHostAuthenticationForLocalhost
Index: src/crypto/external/bsd/openssh/dist/sshd_config.5
diff -u src/crypto/external/bsd/openssh/dist/sshd_config.5:1.3 src/crypto/external/bsd/openssh/dist/sshd_config.5:1.4
--- src/crypto/external/bsd/openssh/dist/sshd_config.5:1.3 Sun Dec 27 01:40:47 2009
+++ src/crypto/external/bsd/openssh/dist/sshd_config.5 Thu Apr 29 17:56:53 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: sshd_config.5,v 1.3 2009/12/27 01:40:47 christos Exp $
+.\" $NetBSD: sshd_config.5,v 1.4 2010/04/29 17:56:53 tron Exp $
.\" -*- nroff -*-
.\"
.\" Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -553,7 +553,7 @@
Multiple algorithms must be comma-separated.
The default is:
.Bd -literal -offset indent
-hmac-md5,hmac-sha1,umac...@openssh.com,
+hmac-md5,hmac-sha1,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96
.Ed
.It Cm Match
