- jmc@cvs.openbsd.org 2008/06/12 19:10:09
[ssh_config.5 ssh-keygen.1]
tweak the ascii art text; ok grunk
diff --git a/ChangeLog b/ChangeLog
index f389859..a68559b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,9 @@
- dtucker@cvs.openbsd.org 2008/06/12 16:35:31
[ssh_config.5 ssh.c]
keyword expansion for localcommand. ok djm@
+ - jmc@cvs.openbsd.org 2008/06/12 19:10:09
+ [ssh_config.5 ssh-keygen.1]
+ tweak the ascii art text; ok grunk
- (dtucker) [clientloop.c serverloop.c] channel_register_filter now
takes 2 more args. with djm@
@@ -4279,4 +4282,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4986 2008/06/12 19:09:18 dtucker Exp $
+$Id: ChangeLog,v 1.4987 2008/06/12 19:18:03 dtucker Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 24daa10..3fff59e 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.77 2008/06/11 22:20:46 grunk Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.78 2008/06/12 19:10:09 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 11 2008 $
+.Dd $Mdocdate: June 12 2008 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -258,14 +258,13 @@
SSH implementations.
.It Fl l
Show fingerprint of specified public key file.
-If invoked along with
-.Fl v ,
-an ASCII art representation of the key is supplied with the fingerprint.
Private RSA1 keys are also supported.
For RSA and DSA keys
.Nm
-tries to find the matching public key file and prints its fingerprint
-and representation.
+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.
diff --git a/ssh_config.5 b/ssh_config.5
index 98cd9ac..53b3b6f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,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.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.109 2008/06/12 16:35:31 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.110 2008/06/12 19:10:09 jmc Exp $
.Dd $Mdocdate: June 12 2008 $
.Dt SSH_CONFIG 5
.Os
@@ -162,9 +162,8 @@
This allows ssh to detect if a host key changed due to DNS spoofing.
If the option is set to
.Dq fingerprint ,
-not only the host IP address will be checked, but also a fingerprint
-along with an ASCII art
-representation of the key will be printed.
+a fingerprint and an ASCII art representation of the key are printed,
+in addition to the host IP address check.
If the option is set to
.Dq no ,
the check will not be executed.