summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2008-06-12 19:10:10 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2008-06-12 19:10:10 +0000
commit6c7d0f67f61bbd6cd8856363f97ceffb7403b4cb (patch)
tree98a5342376f89942808ffcb1cf7d68205a6e5678
parent06d78d26f3ae4d14422a20ebb413e8bf0093187f (diff)
tweak the ascii art text; ok grunk
-rw-r--r--usr.bin/ssh/ssh-keygen.113
-rw-r--r--usr.bin/ssh/ssh_config.57
2 files changed, 9 insertions, 11 deletions
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 24daa1081aa..3fff59e7708 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.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 @@ This option allows importing keys from several commercial
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/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 98cd9ac5b58..53b3b6f1fc2 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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 @@ file.
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.