diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 05:18:03 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 05:18:03 +1000 |
commit | f09e825329d13c5fc31a97fc7ea2312dd4fb5405 (patch) | |
tree | 9d89b9f966c3ad2a6c4c7fd5fd75684c760c05bd | |
parent | 1cf65ae61d1148cb031798657ac514a479c78382 (diff) |
- jmc@cvs.openbsd.org 2008/06/12 19:10:09
[ssh_config.5 ssh-keygen.1]
tweak the ascii art text; ok grunk
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.1 | 13 | ||||
-rw-r--r-- | ssh_config.5 | 7 |
3 files changed, 13 insertions, 12 deletions
@@ -115,6 +115,9 @@ | |||
115 | - dtucker@cvs.openbsd.org 2008/06/12 16:35:31 | 115 | - dtucker@cvs.openbsd.org 2008/06/12 16:35:31 |
116 | [ssh_config.5 ssh.c] | 116 | [ssh_config.5 ssh.c] |
117 | keyword expansion for localcommand. ok djm@ | 117 | keyword expansion for localcommand. ok djm@ |
118 | - jmc@cvs.openbsd.org 2008/06/12 19:10:09 | ||
119 | [ssh_config.5 ssh-keygen.1] | ||
120 | tweak the ascii art text; ok grunk | ||
118 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now | 121 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
119 | takes 2 more args. with djm@ | 122 | takes 2 more args. with djm@ |
120 | 123 | ||
@@ -4279,4 +4282,4 @@ | |||
4279 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4282 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4280 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4283 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4281 | 4284 | ||
4282 | $Id: ChangeLog,v 1.4986 2008/06/12 19:09:18 dtucker Exp $ | 4285 | $Id: ChangeLog,v 1.4987 2008/06/12 19:18:03 dtucker Exp $ |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 24daa1081..3fff59e77 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.77 2008/06/11 22:20:46 grunk Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.78 2008/06/12 19:10:09 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -37,7 +37,7 @@ | |||
37 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 37 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
38 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 38 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
39 | .\" | 39 | .\" |
40 | .Dd $Mdocdate: June 11 2008 $ | 40 | .Dd $Mdocdate: June 12 2008 $ |
41 | .Dt SSH-KEYGEN 1 | 41 | .Dt SSH-KEYGEN 1 |
42 | .Os | 42 | .Os |
43 | .Sh NAME | 43 | .Sh NAME |
@@ -258,14 +258,13 @@ This option allows importing keys from several commercial | |||
258 | SSH implementations. | 258 | SSH implementations. |
259 | .It Fl l | 259 | .It Fl l |
260 | Show fingerprint of specified public key file. | 260 | Show fingerprint of specified public key file. |
261 | If invoked along with | ||
262 | .Fl v , | ||
263 | an ASCII art representation of the key is supplied with the fingerprint. | ||
264 | Private RSA1 keys are also supported. | 261 | Private RSA1 keys are also supported. |
265 | For RSA and DSA keys | 262 | For RSA and DSA keys |
266 | .Nm | 263 | .Nm |
267 | tries to find the matching public key file and prints its fingerprint | 264 | tries to find the matching public key file and prints its fingerprint. |
268 | and representation. | 265 | If combined with |
266 | .Fl v , | ||
267 | an ASCII art representation of the key is supplied with the fingerprint. | ||
269 | .It Fl M Ar memory | 268 | .It Fl M Ar memory |
270 | Specify the amount of memory to use (in megabytes) when generating | 269 | Specify the amount of memory to use (in megabytes) when generating |
271 | candidate moduli for DH-GEX. | 270 | candidate moduli for DH-GEX. |
diff --git a/ssh_config.5 b/ssh_config.5 index 98cd9ac5b..53b3b6f1f 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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: ssh_config.5,v 1.109 2008/06/12 16:35:31 dtucker Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.110 2008/06/12 19:10:09 jmc Exp $ |
38 | .Dd $Mdocdate: June 12 2008 $ | 38 | .Dd $Mdocdate: June 12 2008 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -162,9 +162,8 @@ file. | |||
162 | This allows ssh to detect if a host key changed due to DNS spoofing. | 162 | This allows ssh to detect if a host key changed due to DNS spoofing. |
163 | If the option is set to | 163 | If the option is set to |
164 | .Dq fingerprint , | 164 | .Dq fingerprint , |
165 | not only the host IP address will be checked, but also a fingerprint | 165 | a fingerprint and an ASCII art representation of the key are printed, |
166 | along with an ASCII art | 166 | in addition to the host IP address check. |
167 | representation of the key will be printed. | ||
168 | If the option is set to | 167 | If the option is set to |
169 | .Dq no , | 168 | .Dq no , |
170 | the check will not be executed. | 169 | the check will not be executed. |