[ssh.1 sshd.8]
     document MACs defaults with .Dq
This commit is contained in:
Ben Lindstrom 2001-06-05 19:52:52 +00:00
parent 1bfe29151b
commit bd0e2de8e5
3 changed files with 8 additions and 13 deletions

View File

@ -24,6 +24,9 @@
change preferredauthentication order to change preferredauthentication order to
publickey,hostbased,password,keyboard-interactive publickey,hostbased,password,keyboard-interactive
document that hostbased defaults to no, document order 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 20010528
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@ -5454,4 +5457,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

8
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -898,11 +898,7 @@ The MAC algorithm is used in protocol version 2
for data integrity protection. for data integrity protection.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is The default is
.Pp .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
.Bd -literal
``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
hmac-sha1-96,hmac-md5-96''
.Ed
.It Cm NumberOfPasswordPrompts .It Cm NumberOfPasswordPrompts
Specifies the number of password prompts before giving up. Specifies the number of password prompts before giving up.
The argument to this keyword must be an integer. The argument to this keyword must be an integer.

8
sshd.8
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -586,11 +586,7 @@ The MAC algorithm is used in protocol version 2
for data integrity protection. for data integrity protection.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is The default is
.Pp .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
.Bd -literal
``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
hmac-sha1-96,hmac-md5-96''
.Ed
.It Cm MaxStartups .It Cm MaxStartups
Specifies the maximum number of concurrent unauthenticated connections to the Specifies the maximum number of concurrent unauthenticated connections to the
.Nm .Nm