summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 8e975a0f9..69a9b6f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
24 change preferredauthentication order to 24 change preferredauthentication order to
25 publickey,hostbased,password,keyboard-interactive 25 publickey,hostbased,password,keyboard-interactive
26 document that hostbased defaults to no, document order 26 document that hostbased defaults to no, document order
27 - markus@cvs.openbsd.org 2001/05/19 16:46:19
28 [ssh.1 sshd.8]
29 document MACs defaults with .Dq
27 30
2820010528 3120010528
29 - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c 32 - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@@ -5454,4 +5457,4 @@
5454 - Wrote replacements for strlcpy and mkdtemp 5457 - Wrote replacements for strlcpy and mkdtemp
5455 - Released 1.0pre1 5458 - Released 1.0pre1
5456 5459
5457$Id: ChangeLog,v 1.1232 2001/06/05 19:37:25 mouring Exp $ 5460$Id: ChangeLog,v 1.1233 2001/06/05 19:52:52 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index da1a4c7bd..437484961 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.112 2001/05/19 16:32:16 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.113 2001/05/19 16:46:19 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -898,11 +898,7 @@ The MAC algorithm is used in protocol version 2
898for data integrity protection. 898for data integrity protection.
899Multiple algorithms must be comma-separated. 899Multiple algorithms must be comma-separated.
900The default is 900The default is
901.Pp 901.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
902.Bd -literal
903 ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
904 hmac-sha1-96,hmac-md5-96''
905.Ed
906.It Cm NumberOfPasswordPrompts 902.It Cm NumberOfPasswordPrompts
907Specifies the number of password prompts before giving up. 903Specifies the number of password prompts before giving up.
908The argument to this keyword must be an integer. 904The argument to this keyword must be an integer.
diff --git a/sshd.8 b/sshd.8
index 27eb0d6bf..26201528c 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.122 2001/05/19 16:08:43 markus Exp $ 37.\" $OpenBSD: sshd.8,v 1.123 2001/05/19 16:46:19 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -586,11 +586,7 @@ The MAC algorithm is used in protocol version 2
586for data integrity protection. 586for data integrity protection.
587Multiple algorithms must be comma-separated. 587Multiple algorithms must be comma-separated.
588The default is 588The default is
589.Pp 589.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
590.Bd -literal
591 ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
592 hmac-sha1-96,hmac-md5-96''
593.Ed
594.It Cm MaxStartups 590.It Cm MaxStartups
595Specifies the maximum number of concurrent unauthenticated connections to the 591Specifies the maximum number of concurrent unauthenticated connections to the
596.Nm 592.Nm