mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-28 16:24:39 +02:00
upstream: mention ed25519-sk in places where it is accepted;
prompted by jmc@ OpenBSD-Commit-ID: 076d386739ebe7336c2137e583bc7a5c9538a442
This commit is contained in:
parent
1306643448
commit
97dc5d1d82
11
ssh-keygen.1
11
ssh-keygen.1
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-keygen.1,v 1.174 2019/11/14 21:27:30 djm Exp $
|
.\" $OpenBSD: ssh-keygen.1,v 1.175 2019/11/18 04:50:45 djm 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
|
||||||
@ -35,7 +35,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: November 14 2019 $
|
.Dd $Mdocdate: November 18 2019 $
|
||||||
.Dt SSH-KEYGEN 1
|
.Dt SSH-KEYGEN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -48,7 +48,7 @@
|
|||||||
.Op Fl C Ar comment
|
.Op Fl C Ar comment
|
||||||
.Op Fl f Ar output_keyfile
|
.Op Fl f Ar output_keyfile
|
||||||
.Op Fl m Ar format
|
.Op Fl m Ar format
|
||||||
.Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | rsa
|
.Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
|
||||||
.Op Fl N Ar new_passphrase
|
.Op Fl N Ar new_passphrase
|
||||||
.Op Fl w Ar provider
|
.Op Fl w Ar provider
|
||||||
.Op Fl x Ar flags
|
.Op Fl x Ar flags
|
||||||
@ -251,7 +251,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 (rsa, dsa, ecdsa, ecdsa-sk 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.
|
||||||
@ -586,13 +586,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 | ecdsa-sk | ed25519 | rsa
|
.It Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
|
||||||
Specifies the type of key to create.
|
Specifies the type of key to create.
|
||||||
The possible values are
|
The possible values are
|
||||||
.Dq dsa ,
|
.Dq dsa ,
|
||||||
.Dq ecdsa ,
|
.Dq ecdsa ,
|
||||||
.Dq ecdsa-sk ,
|
.Dq ecdsa-sk ,
|
||||||
.Dq ed25519 ,
|
.Dq ed25519 ,
|
||||||
|
.Dq ed25519-sk ,
|
||||||
or
|
or
|
||||||
.Dq rsa .
|
.Dq rsa .
|
||||||
.Pp
|
.Pp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user