[openssh-commits] [openssh] 04/05: upstream: mention ed25519-sk in places where it is accepted;

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 97dc5d1d82865a7d20f1eb193b5c62ce684024e5
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Nov 18 04:50:45 2019 +0000

    upstream: mention ed25519-sk in places where it is accepted;
    
    prompted by jmc@
    
    OpenBSD-Commit-ID: 076d386739ebe7336c2137e583bc7a5c9538a442
---
 ssh-keygen.1 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 980fdf9f..e4b5e9d6 100644
--- a/ssh-keygen.1
+++ b/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 at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,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: November 14 2019 $
+.Dd $Mdocdate: November 18 2019 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -48,7 +48,7 @@
 .Op Fl C Ar comment
 .Op Fl f Ar output_keyfile
 .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 w Ar provider
 .Op Fl x Ar flags
@@ -251,7 +251,7 @@ should be placed to be activated.
 The options are as follows:
 .Bl -tag -width Ds
 .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
 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.
@@ -586,13 +586,14 @@ section for details.
 Test DH group exchange candidate primes (generated using the
 .Fl G
 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.
 The possible values are
 .Dq dsa ,
 .Dq ecdsa ,
 .Dq ecdsa-sk ,
 .Dq ed25519 ,
+.Dq ed25519-sk ,
 or
 .Dq rsa .
 .Pp

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.