diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /sshd.8 | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'sshd.8')
-rw-r--r-- | sshd.8 | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -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 | |||
314 | to use from those offered by the server. | 314 | to use from those offered by the server. |
315 | Additionally, session integrity is provided | 315 | Additionally, session integrity is provided |
316 | through a cryptographic message authentication code | 316 | through a cryptographic message authentication code |
317 | (hmac-md5, hmac-sha1, umac-64 or hmac-ripemd160). | 317 | (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160, |
318 | hmac-sha2-256 or hmac-sha2-512). | ||
318 | .Pp | 319 | .Pp |
319 | Finally, the server and the client enter an authentication dialog. | 320 | Finally, the server and the client enter an authentication dialog. |
320 | The client tries to authenticate itself using | 321 | The client tries to authenticate itself using |
@@ -462,10 +463,12 @@ is run, and if that | |||
462 | does not exist either, xauth is used to add the cookie. | 463 | does 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 |
465 | specifies the file containing public keys for | 466 | specifies the files containing public keys for |
466 | public key authentication; | 467 | public key authentication; |
467 | if none is specified, the default is | 468 | if none is specified, the default is |
468 | .Pa ~/.ssh/authorized_keys . | 469 | .Pa ~/.ssh/authorized_keys |
470 | and | ||
471 | .Pa ~/.ssh/authorized_keys2 . | ||
469 | Each line of the file contains one | 472 | Each line of the file contains one |
470 | key (empty lines and lines starting with a | 473 | key (empty lines and lines starting with a |
471 | .Ql # | 474 | .Ql # |