diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /ssh-keygen.0 | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'ssh-keygen.0')
-rw-r--r-- | ssh-keygen.0 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ssh-keygen.0 b/ssh-keygen.0 index a972607b2..fe169d81c 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 | |||
@@ -93,7 +93,7 @@ DESCRIPTION | |||
93 | Download the RSA public key stored in the smartcard in reader. | 93 | Download the RSA public key stored in the smartcard in reader. |
94 | 94 | ||
95 | -e This option will read a private or public OpenSSH key file and | 95 | -e This option will read a private or public OpenSSH key file and |
96 | print the key in a `SECSH Public Key File Format' to stdout. | 96 | print the key in RFC 4716 SSH Public Key File Format to stdout. |
97 | This option allows exporting keys for use by several commercial | 97 | This option allows exporting keys for use by several commercial |
98 | SSH implementations. | 98 | SSH implementations. |
99 | 99 | ||
@@ -124,9 +124,9 @@ DESCRIPTION | |||
124 | 124 | ||
125 | -i This option will read an unencrypted private (or public) key file | 125 | -i This option will read an unencrypted private (or public) key file |
126 | in SSH2-compatible format and print an OpenSSH compatible private | 126 | in SSH2-compatible format and print an OpenSSH compatible private |
127 | (or public) key to stdout. ssh-keygen also reads the `SECSH | 127 | (or public) key to stdout. ssh-keygen also reads the RFC 4716 |
128 | Public Key File Format'. This option allows importing keys from | 128 | SSH Public Key File Format. This option allows importing keys |
129 | several commercial SSH implementations. | 129 | from several commercial SSH implementations. |
130 | 130 | ||
131 | -l Show fingerprint of specified public key file. Private RSA1 keys | 131 | -l Show fingerprint of specified public key file. Private RSA1 keys |
132 | are also supported. For RSA and DSA keys ssh-keygen tries to | 132 | are also supported. For RSA and DSA keys ssh-keygen tries to |
@@ -275,8 +275,7 @@ FILES | |||
275 | SEE ALSO | 275 | SEE ALSO |
276 | ssh(1), ssh-add(1), ssh-agent(1), moduli(5), sshd(8) | 276 | ssh(1), ssh-add(1), ssh-agent(1), moduli(5), sshd(8) |
277 | 277 | ||
278 | J. Galbraith and R. Thayer, SECSH Public Key File Format, draft-ietf- | 278 | The Secure Shell (SSH) Public Key File Format, RFC 4716, 2006. |
279 | secsh-publickeyfile-01.txt, March 2001, work in progress material. | ||
280 | 279 | ||
281 | AUTHORS | 280 | AUTHORS |
282 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by | 281 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by |
@@ -285,4 +284,4 @@ AUTHORS | |||
285 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 284 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
286 | versions 1.5 and 2.0. | 285 | versions 1.5 and 2.0. |
287 | 286 | ||
288 | OpenBSD 3.9 September 25, 1999 5 | 287 | OpenBSD 4.1 September 25, 1999 5 |