diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
commit | 4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch) | |
tree | bfbc91107d6bfe7b2a68d8701562e59856116a6a /ssh-keygen.0 | |
parent | 4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff) | |
parent | a55bd782aa819b7f5ae716de000f19f4f531850e (diff) |
Merge 4.1p1 to the trunk.
Diffstat (limited to 'ssh-keygen.0')
-rw-r--r-- | ssh-keygen.0 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ssh-keygen.0 b/ssh-keygen.0 index 998b6f1e0..dd251e4bc 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 | |||
@@ -110,13 +110,14 @@ DESCRIPTION | |||
110 | -g Use generic DNS format when printing fingerprint resource records | 110 | -g Use generic DNS format when printing fingerprint resource records |
111 | using the -r command. | 111 | using the -r command. |
112 | 112 | ||
113 | -H Hash a known_hosts file, printing the result to standard output. | 113 | -H Hash a known_hosts file. This replaces all hostnames and ad- |
114 | This replaces all hostnames and addresses with hashed representa- | 114 | dresses with hashed representations within the specified file; |
115 | tions. These hashes may be used normally by ssh and sshd, but | 115 | the original content is moved to a file with a .old suffix. |
116 | they do not reveal identifying information should the file's con- | 116 | These hashes may be used normally by ssh and sshd, but they do |
117 | tents be disclosed. This option will not modify existing hashed | 117 | not reveal identifying information should the file's contents be |
118 | hostnames and is therefore safe to use on files that mix hashed | 118 | disclosed. This option will not modify existing hashed hostnames |
119 | and non-hashed names. | 119 | and is therefore safe to use on files that mix hashed and non- |
120 | hashed names. | ||
120 | 121 | ||
121 | -i This option will read an unencrypted private (or public) key file | 122 | -i This option will read an unencrypted private (or public) key file |
122 | in SSH2-compatible format and print an OpenSSH compatible private | 123 | in SSH2-compatible format and print an OpenSSH compatible private |
@@ -281,4 +282,4 @@ AUTHORS | |||
281 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 282 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
282 | versions 1.5 and 2.0. | 283 | versions 1.5 and 2.0. |
283 | 284 | ||
284 | OpenBSD 3.6 September 25, 1999 5 | 285 | OpenBSD 3.7 September 25, 1999 5 |