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.0 | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'sshd.0')
-rw-r--r-- | sshd.0 | 33 |
1 files changed, 17 insertions, 16 deletions
@@ -167,8 +167,8 @@ AUTHENTICATION | |||
167 | AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES. The | 167 | AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit AES. The |
168 | client selects the encryption algorithm to use from those offered by the | 168 | client selects the encryption algorithm to use from those offered by the |
169 | server. Additionally, session integrity is provided through a | 169 | server. Additionally, session integrity is provided through a |
170 | cryptographic message authentication code (hmac-md5, hmac-sha1, umac-64 | 170 | cryptographic message authentication code (hmac-md5, hmac-sha1, umac-64, |
171 | or hmac-ripemd160). | 171 | hmac-ripemd160, hmac-sha2-256 or hmac-sha2-512). |
172 | 172 | ||
173 | Finally, the server and the client enter an authentication dialog. The | 173 | Finally, the server and the client enter an authentication dialog. The |
174 | client tries to authenticate itself using host-based authentication, | 174 | client tries to authenticate itself using host-based authentication, |
@@ -261,20 +261,21 @@ SSHRC | |||
261 | exist either, xauth is used to add the cookie. | 261 | exist either, xauth is used to add the cookie. |
262 | 262 | ||
263 | AUTHORIZED_KEYS FILE FORMAT | 263 | AUTHORIZED_KEYS FILE FORMAT |
264 | AuthorizedKeysFile specifies the file containing public keys for public | 264 | AuthorizedKeysFile specifies the files containing public keys for public |
265 | key authentication; if none is specified, the default is | 265 | key authentication; if none is specified, the default is |
266 | ~/.ssh/authorized_keys. Each line of the file contains one key (empty | 266 | ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2. Each line of the |
267 | lines and lines starting with a `#' are ignored as comments). Protocol 1 | 267 | file contains one key (empty lines and lines starting with a `#' are |
268 | public keys consist of the following space-separated fields: options, | 268 | ignored as comments). Protocol 1 public keys consist of the following |
269 | bits, exponent, modulus, comment. Protocol 2 public key consist of: | 269 | space-separated fields: options, bits, exponent, modulus, comment. |
270 | options, keytype, base64-encoded key, comment. The options field is | 270 | Protocol 2 public key consist of: options, keytype, base64-encoded key, |
271 | optional; its presence is determined by whether the line starts with a | 271 | comment. The options field is optional; its presence is determined by |
272 | number or not (the options field never starts with a number). The bits, | 272 | whether the line starts with a number or not (the options field never |
273 | exponent, modulus, and comment fields give the RSA key for protocol | 273 | starts with a number). The bits, exponent, modulus, and comment fields |
274 | version 1; the comment field is not used for anything (but may be | 274 | give the RSA key for protocol version 1; the comment field is not used |
275 | convenient for the user to identify the key). For protocol version 2 the | 275 | for anything (but may be convenient for the user to identify the key). |
276 | keytype is ``ecdsa-sha2-nistp256'', ``ecdsa-sha2-nistp384'', | 276 | For protocol version 2 the keytype is ``ecdsa-sha2-nistp256'', |
277 | ``ecdsa-sha2-nistp521'', ``ssh-dss'' or ``ssh-rsa''. | 277 | ``ecdsa-sha2-nistp384'', ``ecdsa-sha2-nistp521'', ``ssh-dss'' or |
278 | ``ssh-rsa''. | ||
278 | 279 | ||
279 | Note that lines in this file are usually several hundred bytes long | 280 | Note that lines in this file are usually several hundred bytes long |
280 | (because of the size of the public key encoding) up to a limit of 8 | 281 | (because of the size of the public key encoding) up to a limit of 8 |
@@ -631,4 +632,4 @@ CAVEATS | |||
631 | System security is not improved unless rshd, rlogind, and rexecd are | 632 | System security is not improved unless rshd, rlogind, and rexecd are |
632 | disabled (thus completely disabling rlogin and rsh into the machine). | 633 | disabled (thus completely disabling rlogin and rsh into the machine). |
633 | 634 | ||
634 | OpenBSD 4.9 October 28, 2010 OpenBSD 4.9 | 635 | OpenBSD 5.0 August 2, 2011 OpenBSD 5.0 |