diff options
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.1 | 16 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1 index 0d62255ba1f..76ce88ca525 100644 --- a/usr.bin/ssh/ssh-keygen.1 +++ b/usr.bin/ssh/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.95 2010/06/29 23:15:30 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.96 2010/06/30 07:24:25 jmc Exp $ .\" .\" -*- nroff -*- .\" @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 29 2010 $ +.Dd $Mdocdate: June 30 2010 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -222,7 +222,7 @@ print to stdout the key in one of the formats specified by the option. The default export format is .Dq RFC4716 . -This option allows exporting OpenSSH key for use by other programs, including +This option allows exporting OpenSSH keys for use by other programs, including several commercial SSH implementations. .It Fl F Ar hostname Search for the specified @@ -293,15 +293,18 @@ tries to find the matching public key file and prints its fingerprint. If combined with .Fl v , an ASCII art representation of the key is supplied with the fingerprint. +.It Fl M Ar memory +Specify the amount of memory to use (in megabytes) when generating +candidate moduli for DH-GEX. .It Fl m Ar key_format Specify a key format for the .Fl i (import) or .Fl e -(export) coversion options. +(export) conversion options. The supported key formats are: .Dq RFC4716 -(RFC4716/SSH2 public or private key), +(RFC 4716/SSH2 public or private key), .Dq PKCS8 (PEM PKCS8 public key) or @@ -309,9 +312,6 @@ or (PEM public key). The default conversion format is .Dq RFC4716 . -.It Fl M Ar memory -Specify the amount of memory to use (in megabytes) when generating -candidate moduli for DH-GEX. .It Fl N Ar new_passphrase Provides the new passphrase. .It Fl n Ar principals diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 7cfb4b3e014..cd81c430478 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -34,8 +34,8 @@ .\" (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_config.5,v 1.124 2010/06/29 23:16:46 djm Exp $ -.Dd $Mdocdate: June 29 2010 $ +.\" $OpenBSD: sshd_config.5,v 1.125 2010/06/30 07:28:34 jmc Exp $ +.Dd $Mdocdate: June 30 2010 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -178,11 +178,11 @@ When using certificates signed by a key listed in .Cm TrustedUserCAKeys , this file lists names, one of which must appear in the certificate for it to be accepted for authentication. -Names are listed one per line preceeded by key options (as described +Names are listed one per line preceded by key options (as described in .Sx AUTHORIZED_KEYS FILE FORMAT in -.Xr sshd 8 ). +.Xr sshd 8 ) . Empty lines and comments starting with .Ql # are ignored. |