diff options
| author | des <des@FreeBSD.org> | 2011-10-05 22:08:17 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-10-05 22:08:17 +0000 |
| commit | 038442ad80c21a07c19532a176030e2ca51fdd9d (patch) | |
| tree | 654e40360db9b6bb67928b3a5c1b5dbd84925000 /crypto/openssh/sshd.8 | |
| parent | 2276ee273397e0ccd5c7911848e3de9bd91fb1c2 (diff) | |
| parent | a9c7316f0b012b7e85d1a1c4d8b6ce36b9fd9604 (diff) | |
| download | FreeBSD-src-038442ad80c21a07c19532a176030e2ca51fdd9d.zip FreeBSD-src-038442ad80c21a07c19532a176030e2ca51fdd9d.tar.gz | |
Upgrade to OpenSSH 5.9p1.
MFC after: 3 months
Diffstat (limited to 'crypto/openssh/sshd.8')
| -rw-r--r-- | crypto/openssh/sshd.8 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8 index 314300d..70d34c7 100644 --- a/crypto/openssh/sshd.8 +++ b/crypto/openssh/sshd.8 @@ -33,9 +33,9 @@ .\" (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.260 2010/10/28 18:33:28 jmc Exp $ +.\" $OpenBSD: sshd.8,v 1.263 2011/08/02 01:22:11 djm Exp $ .\" $FreeBSD$ -.Dd October 28, 2010 +.Dd August 2, 2011 .Dt SSHD 8 .Os .Sh NAME @@ -315,7 +315,8 @@ 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 -(hmac-md5, hmac-sha1, umac-64 or hmac-ripemd160). +(hmac-md5, hmac-sha1, umac-64, hmac-ripemd160, +hmac-sha2-256 or hmac-sha2-512). .Pp Finally, the server and the client enter an authentication dialog. The client tries to authenticate itself using @@ -465,10 +466,12 @@ is run, and if that does not exist either, xauth is used to add the cookie. .Sh AUTHORIZED_KEYS FILE FORMAT .Cm AuthorizedKeysFile -specifies the file containing public keys for +specifies the files containing public keys for public key authentication; if none is specified, the default is -.Pa ~/.ssh/authorized_keys . +.Pa ~/.ssh/authorized_keys +and +.Pa ~/.ssh/authorized_keys2 . Each line of the file contains one key (empty lines and lines starting with a .Ql # |
