summaryrefslogtreecommitdiff
path: root/sshd.8
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.8')
-rw-r--r--sshd.813
1 files changed, 8 insertions, 5 deletions
diff --git a/sshd.8 b/sshd.8
index 3466aeda1..80b3a1e45 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd.8,v 1.260 2010/10/28 18:33:28 jmc Exp $ 36.\" $OpenBSD: sshd.8,v 1.263 2011/08/02 01:22:11 djm Exp $
37.Dd $Mdocdate: October 28 2010 $ 37.Dd $Mdocdate: August 2 2011 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -314,7 +314,8 @@ The client selects the encryption algorithm
314to use from those offered by the server. 314to use from those offered by the server.
315Additionally, session integrity is provided 315Additionally, session integrity is provided
316through a cryptographic message authentication code 316through a cryptographic message authentication code
317(hmac-md5, hmac-sha1, umac-64 or hmac-ripemd160). 317(hmac-md5, hmac-sha1, umac-64, hmac-ripemd160,
318hmac-sha2-256 or hmac-sha2-512).
318.Pp 319.Pp
319Finally, the server and the client enter an authentication dialog. 320Finally, the server and the client enter an authentication dialog.
320The client tries to authenticate itself using 321The client tries to authenticate itself using
@@ -462,10 +463,12 @@ is run, and if that
462does not exist either, xauth is used to add the cookie. 463does not exist either, xauth is used to add the cookie.
463.Sh AUTHORIZED_KEYS FILE FORMAT 464.Sh AUTHORIZED_KEYS FILE FORMAT
464.Cm AuthorizedKeysFile 465.Cm AuthorizedKeysFile
465specifies the file containing public keys for 466specifies the files containing public keys for
466public key authentication; 467public key authentication;
467if none is specified, the default is 468if none is specified, the default is
468.Pa ~/.ssh/authorized_keys . 469.Pa ~/.ssh/authorized_keys
470and
471.Pa ~/.ssh/authorized_keys2 .
469Each line of the file contains one 472Each line of the file contains one
470key (empty lines and lines starting with a 473key (empty lines and lines starting with a
471.Ql # 474.Ql #