summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-05 19:52:52 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-05 19:52:52 +0000
commitbd0e2de8e59b4588a45a27c168e70bba95db9969 (patch)
treecf23efa56111c1a1685f863b5905f2e0e81fb8d0
parent1bfe29151b064d3e1f56c4c45b7f5b74369fcc37 (diff)
- markus@cvs.openbsd.org 2001/05/19 16:46:19
[ssh.1 sshd.8] document MACs defaults with .Dq
-rw-r--r--ChangeLog5
-rw-r--r--ssh.18
-rw-r--r--sshd.88
3 files changed, 8 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e975a0f..69a9b6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
change preferredauthentication order to
publickey,hostbased,password,keyboard-interactive
document that hostbased defaults to no, document order
+ - markus@cvs.openbsd.org 2001/05/19 16:46:19
+ [ssh.1 sshd.8]
+ document MACs defaults with .Dq
20010528
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@@ -5454,4 +5457,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1232 2001/06/05 19:37:25 mouring Exp $
+$Id: ChangeLog,v 1.1233 2001/06/05 19:52:52 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index da1a4c7b..43748496 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (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.1,v 1.112 2001/05/19 16:32:16 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.113 2001/05/19 16:46:19 markus Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -898,11 +898,7 @@ The MAC algorithm is used in protocol version 2
for data integrity protection.
Multiple algorithms must be comma-separated.
The default is
-.Pp
-.Bd -literal
- ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
- hmac-sha1-96,hmac-md5-96''
-.Ed
+.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
.It Cm NumberOfPasswordPrompts
Specifies the number of password prompts before giving up.
The argument to this keyword must be an integer.
diff --git a/sshd.8 b/sshd.8
index 27eb0d6b..26201528 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
.\" (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.8,v 1.122 2001/05/19 16:08:43 markus Exp $
+.\" $OpenBSD: sshd.8,v 1.123 2001/05/19 16:46:19 markus Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -586,11 +586,7 @@ The MAC algorithm is used in protocol version 2
for data integrity protection.
Multiple algorithms must be comma-separated.
The default is
-.Pp
-.Bd -literal
- ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
- hmac-sha1-96,hmac-md5-96''
-.Ed
+.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
.It Cm MaxStartups
Specifies the maximum number of concurrent unauthenticated connections to the
.Nm