tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

rsa1 is no longer valid;

Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89
This commit is contained in:
jmc@openbsd.org 2017-05-02 17:04:09 +00:00 committed by Damien Miller
parent 42b690b4fd
commit f10c0d32cd
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.138 2017/05/02 09:05:58 jmc Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.139 2017/05/02 17:04:09 jmc Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -46,7 +46,7 @@
.Nm ssh-keygen .Nm ssh-keygen
.Op Fl q .Op Fl q
.Op Fl b Ar bits .Op Fl b Ar bits
.Op Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 .Op Fl t Cm dsa | ecdsa | ed25519 | rsa
.Op Fl N Ar new_passphrase .Op Fl N Ar new_passphrase
.Op Fl C Ar comment .Op Fl C Ar comment
.Op Fl f Ar output_keyfile .Op Fl f Ar output_keyfile
@ -223,7 +223,7 @@ should be placed to be activated.
The options are as follows: The options are as follows:
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl A .It Fl A
For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) For each of the key types (rsa, dsa, ecdsa and ed25519)
for which host keys for which host keys
do not exist, generate the host keys with the default key file path, do not exist, generate the host keys with the default key file path,
an empty passphrase, default bits for the key type, and default comment. an empty passphrase, default bits for the key type, and default comment.
@ -557,17 +557,14 @@ section for details.
Test DH group exchange candidate primes (generated using the Test DH group exchange candidate primes (generated using the
.Fl G .Fl G
option) for safety. option) for safety.
.It Fl t Cm dsa | ecdsa | ed25519 | rsa | rsa1 .It Fl t Cm dsa | ecdsa | ed25519 | rsa
Specifies the type of key to create. Specifies the type of key to create.
The possible values are The possible values are
.Dq rsa1
for protocol version 1 and
.Dq dsa , .Dq dsa ,
.Dq ecdsa , .Dq ecdsa ,
.Dq ed25519 , .Dq ed25519 ,
or or
.Dq rsa .Dq rsa .
for protocol version 2.
.It Fl u .It Fl u
Update a KRL. Update a KRL.
When specified with When specified with

9
ssh-keyscan.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keyscan.1,v 1.39 2017/04/30 23:18:44 djm Exp $ .\" $OpenBSD: ssh-keyscan.1,v 1.40 2017/05/02 17:04:09 jmc Exp $
.\" .\"
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
.\" .\"
@ -6,7 +6,7 @@
.\" permitted provided that due credit is given to the author and the .\" permitted provided that due credit is given to the author and the
.\" OpenBSD project by leaving this copyright notice intact. .\" OpenBSD project by leaving this copyright notice intact.
.\" .\"
.Dd $Mdocdate: April 30 2017 $ .Dd $Mdocdate: May 2 2017 $
.Dt SSH-KEYSCAN 1 .Dt SSH-KEYSCAN 1
.Os .Os
.Sh NAME .Sh NAME
@ -90,14 +90,11 @@ Default is 5 seconds.
.It Fl t Ar type .It Fl t Ar type
Specifies the type of the key to fetch from the scanned hosts. Specifies the type of the key to fetch from the scanned hosts.
The possible values are The possible values are
.Dq rsa1
for protocol version 1 and
.Dq dsa , .Dq dsa ,
.Dq ecdsa , .Dq ecdsa ,
.Dq ed25519 , .Dq ed25519 ,
or or
.Dq rsa .Dq rsa .
for protocol version 2.
Multiple values may be specified by separating them with commas. Multiple values may be specified by separating them with commas.
The default is to fetch The default is to fetch
.Dq rsa , .Dq rsa ,