tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 19:08:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: more missing mentions of ed25519-sk; ok djm@

Browse Source 
OpenBSD-Commit-ID: f242e53366f61697dffd53af881bc5daf78230ff
This commit is contained in:
naddy@openbsd.org 2019-11-18 23:16:49 +00:00 committed by Damien Miller
parent 189550f5bc
commit f0edda81c5
5 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh-add.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-add.1,v 1.74 2019/11/15 11:16:28 jmc Exp $ .\" $OpenBSD: ssh-add.1,v 1.75 2019/11/18 23:16:49 naddy 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 15 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSH-ADD 1 .Dt SSH-ADD 1
.Os .Os
.Sh NAME .Sh NAME
@ -64,8 +64,9 @@ When run without arguments, it adds the files
.Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ecdsa_sk ,
.Pa ~/.ssh/id_ed25519 ,
and and
.Pa ~/.ssh/id_ed25519 . .Pa ~/.ssh/id_ed25519_sk .
After loading a private key, After loading a private key,
.Nm .Nm
will try to load corresponding certificate information from the will try to load corresponding certificate information from the
@ -209,6 +210,8 @@ Contains the ECDSA authentication identity of the user.
Contains the security key-hosted ECDSA authentication identity of the user. Contains the security key-hosted ECDSA authentication identity of the user.
.It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519
Contains the Ed25519 authentication identity of the user. Contains the Ed25519 authentication identity of the user.
.It Pa ~/.ssh/id_ed25519_sk
Contains the security key-hosted Ed25519 authentication identity of the user.
.It Pa ~/.ssh/id_rsa .It Pa ~/.ssh/id_rsa
Contains the RSA authentication identity of the user. Contains the RSA authentication identity of the user.
.El .El

17
ssh-keygen.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.175 2019/11/18 04:50:45 djm Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.176 2019/11/18 23:16:49 naddy 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
@ -191,7 +191,8 @@ key in
.Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ecdsa_sk ,
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519 ,
.Pa ~/.ssh/id_ed25519_sk
or or
.Pa ~/.ssh/id_rsa . .Pa ~/.ssh/id_rsa .
Additionally, the system administrator may use this to generate host keys, Additionally, the system administrator may use this to generate host keys,
@ -285,7 +286,7 @@ flag determines the key length by selecting from one of three elliptic
curve sizes: 256, 384 or 521 bits. curve sizes: 256, 384 or 521 bits.
Attempting to use bit lengths other than these three values for ECDSA keys Attempting to use bit lengths other than these three values for ECDSA keys
will fail. will fail.
ECDSA-SK and Ed25519 keys have a fixed length and the ECDSA-SK, Ed25519 and Ed25519-SK keys have a fixed length and the
.Fl b .Fl b
flag will be ignored. flag will be ignored.
.It Fl C Ar comment .It Fl C Ar comment
@ -1044,9 +1045,10 @@ hardware security keys.
.It Pa ~/.ssh/id_ecdsa .It Pa ~/.ssh/id_ecdsa
.It Pa ~/.ssh/id_ecdsa_sk .It Pa ~/.ssh/id_ecdsa_sk
.It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519
.It Pa ~/.ssh/id_ed25519_sk
.It Pa ~/.ssh/id_rsa .It Pa ~/.ssh/id_rsa
Contains the DSA, ECDSA, security key-hosted ECDSA, Ed25519 or RSA Contains the DSA, ECDSA, security key-hosted ECDSA, Ed25519,
authentication identity of the user. security key-hosted Ed25519 or RSA authentication identity of the user.
This file should not be readable by anyone but the user. This file should not be readable by anyone but the user.
It is possible to It is possible to
specify a passphrase when generating the key; that passphrase will be specify a passphrase when generating the key; that passphrase will be
@ -1061,9 +1063,10 @@ will read this file when a login attempt is made.
.It Pa ~/.ssh/id_ecdsa.pub .It Pa ~/.ssh/id_ecdsa.pub
.It Pa ~/.ssh/id_ecdsa_sk.pub .It Pa ~/.ssh/id_ecdsa_sk.pub
.It Pa ~/.ssh/id_ed25519.pub .It Pa ~/.ssh/id_ed25519.pub
.It Pa ~/.ssh/id_ed25519_sk.pub
.It Pa ~/.ssh/id_rsa.pub .It Pa ~/.ssh/id_rsa.pub
Contains the DSA, ECDSA, security key-hosted ECDSA, Ed25519 or RSA Contains the DSA, ECDSA, security key-hosted ECDSA, Ed25519,
public key for authentication. security key-hosted Ed25519 or RSA public key for authentication.
The contents of this file should be added to The contents of this file should be added to
.Pa ~/.ssh/authorized_keys .Pa ~/.ssh/authorized_keys
on all machines on all machines

4
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.368 2019/11/18 16:10:05 naddy Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.369 2019/11/18 23:16:49 naddy Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2735,7 +2735,7 @@ usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" "usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n"
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | rsa]\n" " [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n"
" [-N new_passphrase] [-w provider] [-x flags]\n" " [-N new_passphrase] [-w provider] [-x flags]\n"
" ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" " ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n"
" [-P old_passphrase]\n" " [-P old_passphrase]\n"

13
ssh.1
View File

@ -33,8 +33,8 @@
.\" (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.1,v 1.405 2019/11/14 21:27:30 djm Exp $ .\" $OpenBSD: ssh.1,v 1.406 2019/11/18 23:16:49 naddy Exp $
.Dd $Mdocdate: November 14 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -280,7 +280,8 @@ The default is
.Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ecdsa_sk ,
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519 ,
.Pa ~/.ssh/id_ed25519_sk
and and
.Pa ~/.ssh/id_rsa . .Pa ~/.ssh/id_rsa .
Identity files may also be specified on Identity files may also be specified on
@ -901,6 +902,8 @@ This stores the private key in
(security key-hosted ECDSA), (security key-hosted ECDSA),
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519
(Ed25519), (Ed25519),
.Pa ~/.ssh/id_ed25519_sk
(security key-hosted Ed25519),
or or
.Pa ~/.ssh/id_rsa .Pa ~/.ssh/id_rsa
(RSA) (RSA)
@ -913,6 +916,8 @@ and stores the public key in
(security key-hosted ECDSA), (security key-hosted ECDSA),
.Pa ~/.ssh/id_ed25519.pub .Pa ~/.ssh/id_ed25519.pub
(Ed25519), (Ed25519),
.Pa ~/.ssh/id_ed25519_sk.pub
(security key-hosted Ed25519),
or or
.Pa ~/.ssh/id_rsa.pub .Pa ~/.ssh/id_rsa.pub
(RSA) (RSA)
@ -1491,6 +1496,7 @@ above.
.It Pa ~/.ssh/id_ecdsa .It Pa ~/.ssh/id_ecdsa
.It Pa ~/.ssh/id_ecdsa_sk .It Pa ~/.ssh/id_ecdsa_sk
.It Pa ~/.ssh/id_ed25519 .It Pa ~/.ssh/id_ed25519
.It Pa ~/.ssh/id_ed25519_sk
.It Pa ~/.ssh/id_rsa .It Pa ~/.ssh/id_rsa
Contains the private key for authentication. Contains the private key for authentication.
These files These files
@ -1506,6 +1512,7 @@ sensitive part of this file using AES-128.
.It Pa ~/.ssh/id_ecdsa.pub .It Pa ~/.ssh/id_ecdsa.pub
.It Pa ~/.ssh/id_ecdsa_sk.pub .It Pa ~/.ssh/id_ecdsa_sk.pub
.It Pa ~/.ssh/id_ed25519.pub .It Pa ~/.ssh/id_ed25519.pub
.It Pa ~/.ssh/id_ed25519_sk.pub
.It Pa ~/.ssh/id_rsa.pub .It Pa ~/.ssh/id_rsa.pub
Contains the public key for authentication. Contains the public key for authentication.
These files are not These files are not

6
ssh_config.5
View File

@ -33,7 +33,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.307 2019/11/18 04:55:02 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.308 2019/11/18 23:16:49 naddy Exp $
.Dd $Mdocdate: November 18 2019 $ .Dd $Mdocdate: November 18 2019 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -931,8 +931,8 @@ The default is
.Pa ~/.ssh/id_dsa , .Pa ~/.ssh/id_dsa ,
.Pa ~/.ssh/id_ecdsa , .Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ecdsa_sk , .Pa ~/.ssh/id_ecdsa_sk ,
.Pa ~/.ssh/id_ed25519_sk , .Pa ~/.ssh/id_ed25519 ,
.Pa ~/.ssh/id_ed25519 .Pa ~/.ssh/id_ed25519_sk
and and
.Pa ~/.ssh/id_rsa . .Pa ~/.ssh/id_rsa .
Additionally, any identities represented by the authentication agent Additionally, any identities represented by the authentication agent