From 5e7c30bdf1629884f09f0713973f9ad635990e8c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 11 Jun 2007 14:06:32 +1000 Subject: [PATCH] - jmc@cvs.openbsd.org 2007/06/08 07:43:46 [ssh_config.5] put the MAC list into a display, like we do for ciphers, since groff has trouble handling wide lines; --- ChangeLog | 6 +++++- ssh_config.5 | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ab835b57..db3978358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ Add a "MACs" line after "Ciphers" with the default MAC algorithms, to ease people who want to tweak both (eg. for performance reasons). ok deraadt@ djm@ dtucker@ + - jmc@cvs.openbsd.org 2007/06/08 07:43:46 + [ssh_config.5] + put the MAC list into a display, like we do for ciphers, + since groff has trouble handling wide lines; 20070605 - (dtucker) OpenBSD CVS Sync @@ -2991,4 +2995,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4682 2007/06/11 04:04:42 djm Exp $ +$Id: ChangeLog,v 1.4683 2007/06/11 04:06:32 djm Exp $ diff --git a/ssh_config.5 b/ssh_config.5 index 4537fb7f8..2af086592 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,8 +34,8 @@ .\" (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: ssh_config.5,v 1.100 2007/06/07 19:37:34 pvalchev Exp $ -.Dd $Mdocdate: June 7 2007 $ +.\" $OpenBSD: ssh_config.5,v 1.101 2007/06/08 07:43:46 jmc Exp $ +.Dd $Mdocdate: June 8 2007 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -641,7 +641,10 @@ The MAC algorithm is used in protocol version 2 for data integrity protection. Multiple algorithms must be comma-separated. The default is: -.Dq hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . +.Bd -literal -offset indent +hmac-md5,hmac-sha1,umac-64@openssh.com, +hmac-ripemd160,hmac-sha1-96,hmac-md5-96 +.Ed .It Cm NoHostAuthenticationForLocalhost This option can be used if the home directory is shared across machines. In this case localhost will refer to a different machine on each of