- jmc@cvs.openbsd.org 2008/06/12 19:10:09

[ssh_config.5 ssh-keygen.1]
     tweak the ascii art text; ok grunk
This commit is contained in:
Darren Tucker 2008-06-13 05:18:03 +10:00
parent 1cf65ae61d
commit f09e825329
3 changed files with 13 additions and 12 deletions

View File

@ -115,6 +115,9 @@
- dtucker@cvs.openbsd.org 2008/06/12 16:35:31 - dtucker@cvs.openbsd.org 2008/06/12 16:35:31
[ssh_config.5 ssh.c] [ssh_config.5 ssh.c]
keyword expansion for localcommand. ok djm@ 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 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
takes 2 more args. with djm@ takes 2 more args. with djm@
@ -4279,4 +4282,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

View File

@ -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 -*- .\" -*- nroff -*-
.\" .\"
@ -37,7 +37,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dt SSH-KEYGEN 1
.Os .Os
.Sh NAME .Sh NAME
@ -258,14 +258,13 @@ This option allows importing keys from several commercial
SSH implementations. SSH implementations.
.It Fl l .It Fl l
Show fingerprint of specified public key file. 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. Private RSA1 keys are also supported.
For RSA and DSA keys For RSA and DSA keys
.Nm .Nm
tries to find the matching public key file and prints its fingerprint tries to find the matching public key file and prints its fingerprint.
and representation. If combined with
.Fl v ,
an ASCII art representation of the key is supplied with the fingerprint.
.It Fl M Ar memory .It Fl M Ar memory
Specify the amount of memory to use (in megabytes) when generating Specify the amount of memory to use (in megabytes) when generating
candidate moduli for DH-GEX. candidate moduli for DH-GEX.

View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: June 12 2008 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -162,9 +162,8 @@ file.
This allows ssh to detect if a host key changed due to DNS spoofing. This allows ssh to detect if a host key changed due to DNS spoofing.
If the option is set to If the option is set to
.Dq fingerprint , .Dq fingerprint ,
not only the host IP address will be checked, but also a fingerprint a fingerprint and an ASCII art representation of the key are printed,
along with an ASCII art in addition to the host IP address check.
representation of the key will be printed.
If the option is set to If the option is set to
.Dq no , .Dq no ,
the check will not be executed. the check will not be executed.