[src/trunk]: src/crypto/external/bsd/openssh/dist Don't mention "umac-64@open...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/150ae5136dd7
branches:  trunk
changeset: 754400:150ae5136dd7
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Apr 29 17:56:53 2010 +0000

description:
Don't mention "umac-64%openssh.com@localhost" 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.

diffstat:

 crypto/external/bsd/openssh/dist/ssh_config    |  4 ++--
 crypto/external/bsd/openssh/dist/ssh_config.5  |  4 ++--
 crypto/external/bsd/openssh/dist/sshd_config.5 |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 5a4ac57eacd2 -r 150ae5136dd7 crypto/external/bsd/openssh/dist/ssh_config
--- a/crypto/external/bsd/openssh/dist/ssh_config       Thu Apr 29 17:39:03 2010 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh_config       Thu Apr 29 17:56:53 2010 +0000
@@ -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-64%openssh.com@localhost,hmac-ripemd160
+#   MACs hmac-md5,hmac-sha1,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any
diff -r 5a4ac57eacd2 -r 150ae5136dd7 crypto/external/bsd/openssh/dist/ssh_config.5
--- a/crypto/external/bsd/openssh/dist/ssh_config.5     Thu Apr 29 17:39:03 2010 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh_config.5     Thu Apr 29 17:56:53 2010 +0000
@@ -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 <ylo%cs.hut.fi@localhost>
@@ -667,7 +667,7 @@
 Multiple algorithms must be comma-separated.
 The default is:
 .Bd -literal -offset indent
-hmac-md5,hmac-sha1,umac-64%openssh.com@localhost,
+hmac-md5,hmac-sha1,
 hmac-ripemd160,hmac-sha1-96,hmac-md5-96
 .Ed
 .It Cm NoHostAuthenticationForLocalhost
diff -r 5a4ac57eacd2 -r 150ae5136dd7 crypto/external/bsd/openssh/dist/sshd_config.5
--- a/crypto/external/bsd/openssh/dist/sshd_config.5    Thu Apr 29 17:39:03 2010 +0000
+++ b/crypto/external/bsd/openssh/dist/sshd_config.5    Thu Apr 29 17:56:53 2010 +0000
@@ -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 <ylo%cs.hut.fi@localhost>
@@ -553,7 +553,7 @@
 Multiple algorithms must be comma-separated.
 The default is:
 .Bd -literal -offset indent
-hmac-md5,hmac-sha1,umac-64%openssh.com@localhost,
+hmac-md5,hmac-sha1,
 hmac-ripemd160,hmac-sha1-96,hmac-md5-96
 .Ed
 .It Cm Match