From 22b7b4933108dd07c9000bffcde8c13dbdcd240f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 11 Jun 2007 14:07:12 +1000 Subject: [PATCH] - jmc@cvs.openbsd.org 2007/06/08 07:48:09 [sshd_config.5] oops, here too: put the MAC list into a display, like we do for ciphers, since groff has trouble with wide lines; --- ChangeLog | 6 +++++- sshd_config.5 | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index db3978358..5b59ef79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,10 @@ [ssh_config.5] put the MAC list into a display, like we do for ciphers, since groff has trouble handling wide lines; + - jmc@cvs.openbsd.org 2007/06/08 07:48:09 + [sshd_config.5] + oops, here too: put the MAC list into a display, like we do for + ciphers, since groff has trouble with wide lines; 20070605 - (dtucker) OpenBSD CVS Sync @@ -2995,4 +2999,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.4683 2007/06/11 04:06:32 djm Exp $ +$Id: ChangeLog,v 1.4684 2007/06/11 04:07:12 djm Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index 528f52147..2a283ea2d 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.76 2007/06/07 19:37:34 pvalchev Exp $ -.Dd $Mdocdate: June 7 2007 $ +.\" $OpenBSD: sshd_config.5,v 1.77 2007/06/08 07:48:09 jmc Exp $ +.Dd $Mdocdate: June 8 2007 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -489,7 +489,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 Match Introduces a conditional block. If all of the criteria on the