Module Name: src
Committed By: snj
Date: Thu May 20 05:25:30 UTC 2010
Modified Files:
src/crypto/dist/ssh [netbsd-5]: ssh_config ssh_config.5 sshd_config.5
Log Message:
Pull up following revision(s) (requested by drochner in ticket #1384):
crypto/external/bsd/openssh/dist/ssh_config.5: revision 1.3 via patch
crypto/external/bsd/openssh/dist/sshd_config.5: revision 1.4 via patch
crypto/external/bsd/openssh/dist/ssh_config: revision 1.3 via patch
Don't mention "[email protected]" 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.14 -r1.14.6.1 src/crypto/dist/ssh/ssh_config
cvs rdiff -u -r1.16 -r1.16.8.1 src/crypto/dist/ssh/ssh_config.5
cvs rdiff -u -r1.15 -r1.15.8.1 src/crypto/dist/ssh/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/dist/ssh/ssh_config
diff -u src/crypto/dist/ssh/ssh_config:1.14 src/crypto/dist/ssh/ssh_config:1.14.6.1
--- src/crypto/dist/ssh/ssh_config:1.14 Fri Apr 25 15:01:45 2008
+++ src/crypto/dist/ssh/ssh_config Thu May 20 05:25:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ssh_config,v 1.14 2008/04/25 15:01:45 jmmv Exp $
+# $NetBSD: ssh_config,v 1.14.6.1 2010/05/20 05:25:30 snj Exp $
# $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
# This is the ssh client system-wide configuration file. See
@@ -39,7 +39,7 @@
# Protocol 2,1
# Cipher 3des
# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
-# MACs hmac-md5,hmac-sha1,[email protected],hmac-ripemd160
+# MACs hmac-md5,hmac-sha1,hmac-ripemd160
# EscapeChar ~
# Tunnel no
# TunnelDevice any:any
Index: src/crypto/dist/ssh/ssh_config.5
diff -u src/crypto/dist/ssh/ssh_config.5:1.16 src/crypto/dist/ssh/ssh_config.5:1.16.8.1
--- src/crypto/dist/ssh/ssh_config.5:1.16 Sun Apr 6 23:38:20 2008
+++ src/crypto/dist/ssh/ssh_config.5 Thu May 20 05:25:30 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: ssh_config.5,v 1.16 2008/04/06 23:38:20 christos Exp $
+.\" $NetBSD: ssh_config.5,v 1.16.8.1 2010/05/20 05:25:30 snj Exp $
.\" -*- nroff -*-
.\"
.\" Author: Tatu Ylonen <[email protected]>
@@ -651,7 +651,7 @@
Multiple algorithms must be comma-separated.
The default is:
.Bd -literal -offset indent
-hmac-md5,hmac-sha1,[email protected],
+hmac-md5,hmac-sha1,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96
.Ed
.It Cm NoHostAuthenticationForLocalhost
Index: src/crypto/dist/ssh/sshd_config.5
diff -u src/crypto/dist/ssh/sshd_config.5:1.15 src/crypto/dist/ssh/sshd_config.5:1.15.8.1
--- src/crypto/dist/ssh/sshd_config.5:1.15 Sun Apr 6 23:38:20 2008
+++ src/crypto/dist/ssh/sshd_config.5 Thu May 20 05:25:30 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: sshd_config.5,v 1.15 2008/04/06 23:38:20 christos Exp $
+.\" $NetBSD: sshd_config.5,v 1.15.8.1 2010/05/20 05:25:30 snj Exp $
.\" -*- nroff -*-
.\"
.\" Author: Tatu Ylonen <[email protected]>
@@ -538,7 +538,7 @@
Multiple algorithms must be comma-separated.
The default is:
.Bd -literal -offset indent
-hmac-md5,hmac-sha1,[email protected],
+hmac-md5,hmac-sha1,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96
.Ed
.It Cm Match
