- dtucker@cvs.openbsd.org 2008/01/01 09:06:39

[openssh.git] / sshd.8

diff --git a/sshd.8 b/sshd.8
index 60616c4bd61f362b9d7e9b1051ece9da091b005b..419394329838e0b43dae326962e49c7e190e188a 100644 (file)
--- 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.
 .\"
 .\" (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.236 2007/05/31 19:20:16 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.237 2007/06/07 19:37:34 pvalchev Exp $

 .Dd $Mdocdate$
 .Dt SSHD 8
 .Os
 .Dd $Mdocdate$
 .Dt SSHD 8
 .Os


@@ -276,7 +276,7 @@ The client selects the encryption algorithm
 to use from those offered by the server.
 Additionally, session integrity is provided
 through a cryptographic message authentication code
 to use from those offered by the server.
 Additionally, session integrity is provided
 through a cryptographic message authentication code

-(hmac-sha1 or hmac-md5).
+(hmac-md5, hmac-sha1, umac-64 or hmac-ripemd160).

 .Pp
 Finally, the server and the client enter an authentication dialog.
 The client tries to authenticate itself using
 .Pp
 Finally, the server and the client enter an authentication dialog.
 The client tries to authenticate itself using


@@ -302,8 +302,9 @@ on Tru64,
 a leading
 .Ql \&*LOCKED\&*
 on FreeBSD and a leading
 a leading
 .Ql \&*LOCKED\&*
 on FreeBSD and a leading

-.Ql \&!!
-on Linux).  If there is a requirement to disable password authentication
+.Ql \&!
+on most Linuxes).
+If there is a requirement to disable password authentication

 for the account while allowing still public-key, then the passwd field
 should be set to something other than these values (eg
 .Ql NP
 for the account while allowing still public-key, then the passwd field
 should be set to something other than these values (eg
 .Ql NP