summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:31:22 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:31:22 +1100
commitdcfea27f1b4e7af8019f8539dd53188af1ccded3 (patch)
tree5011f4b7d241c64bc88e9200feabb5c583c53e7c
parent20c2ec48c376fc025774bbb903f57de449bb8c5c (diff)
- jmc@cvs.openbsd.org 2006/02/12 10:52:41
[sshd.8] rework the description of authorized_keys a little;
-rw-r--r--ChangeLog5
-rw-r--r--sshd.829
2 files changed, 17 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 70b3bcc62..608a438cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 - jmc@cvs.openbsd.org 2006/02/12 10:49:44 82 - jmc@cvs.openbsd.org 2006/02/12 10:49:44
83 [ssh_config.5] 83 [ssh_config.5]
84 slight rewording; ok djm 84 slight rewording; ok djm
85 - jmc@cvs.openbsd.org 2006/02/12 10:52:41
86 [sshd.8]
87 rework the description of authorized_keys a little;
85 88
8620060313 8920060313
87 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 90 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3983,4 +3986,4 @@
3983 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3986 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3984 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3987 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3985 3988
3986$Id: ChangeLog,v 1.4162 2006/03/15 00:31:01 djm Exp $ 3989$Id: ChangeLog,v 1.4163 2006/03/15 00:31:22 djm Exp $
diff --git a/sshd.8 b/sshd.8
index e884e2b09..909339f07 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.216 2006/02/09 10:10:47 jmc Exp $ 37.\" $OpenBSD: sshd.8,v 1.217 2006/02/12 10:52:41 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -374,27 +374,24 @@ authentication protocol and cookie in standard input.
374Runs user's shell or command. 374Runs user's shell or command.
375.El 375.El
376.Sh AUTHORIZED_KEYS FILE FORMAT 376.Sh AUTHORIZED_KEYS FILE FORMAT
377.Pa ~/.ssh/authorized_keys
378is the default file that lists the public keys that are
379permitted for RSA authentication in protocol version 1
380and for public key authentication (PubkeyAuthentication)
381in protocol version 2.
382.Cm AuthorizedKeysFile 377.Cm AuthorizedKeysFile
383may be used to specify an alternative file. 378specifies the file containing public keys for
384.Pp 379public key authentication;
380if none is specified, the default is
381.Pa ~/.ssh/authorized_keys .
385Each line of the file contains one 382Each line of the file contains one
386key (empty lines and lines starting with a 383key (empty lines and lines starting with a
387.Ql # 384.Ql #
388are ignored as 385are ignored as
389comments). 386comments).
390Each RSA public key consists of the following fields, separated by 387Protocol 1 public keys consist of the following space-separated fields:
391spaces: options, bits, exponent, modulus, comment. 388options, bits, exponent, modulus, comment.
392Each protocol version 2 public key consists of: 389Protocol 2 public key consist of:
393options, keytype, base64 encoded key, comment. 390options, keytype, base64-encoded key, comment.
394The options field 391The options field is optional;
395is optional; its presence is determined by whether the line starts 392its presence is determined by whether the line starts
396with a number or not (the options field never starts with a number). 393with a number or not (the options field never starts with a number).
397The bits, exponent, modulus and comment fields give the RSA key for 394The bits, exponent, modulus, and comment fields give the RSA key for
398protocol version 1; the 395protocol version 1; the
399comment field is not used for anything (but may be convenient for the 396comment field is not used for anything (but may be convenient for the
400user to identify the key). 397user to identify the key).
@@ -409,7 +406,7 @@ Note that lines in this file are usually several hundred bytes long
409keys up to 16 kilobits. 406keys up to 16 kilobits.
410You don't want to type them in; instead, copy the 407You don't want to type them in; instead, copy the
411.Pa identity.pub , 408.Pa identity.pub ,
412.Pa id_dsa.pub 409.Pa id_dsa.pub ,
413or the 410or the
414.Pa id_rsa.pub 411.Pa id_rsa.pub
415file and edit it. 412file and edit it.