upstream: mention ed25519-sk key/cert types here too; prompted by

jmc@

OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818

diff --git a/ssh_config.5 b/ssh_config.5
index 6983f7af4ec6d4f2fada70d5dcde01ea3d3833c2..1f3c3413fae32d70c6d62bb94e954e4ba107bf92 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.306 2019/11/14 21:27:30 djm Exp $
-.Dd $Mdocdate: November 14 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.307 2019/11/18 04:55:02 djm Exp $
+.Dd $Mdocdate: November 18 2019 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -931,6 +931,7 @@ The default is
 .Pa ~/.ssh/id_dsa ,
 .Pa ~/.ssh/id_ecdsa ,
 .Pa ~/.ssh/id_ecdsa_sk ,
+.Pa ~/.ssh/id_ed25519_sk ,
 .Pa ~/.ssh/id_ed25519
 and
 .Pa ~/.ssh/id_rsa .
@@ -1326,12 +1327,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
 ecdsa-sha2-nistp256-cert-v01@openssh.com,
 ecdsa-sha2-nistp384-cert-v01@openssh.com,
 ecdsa-sha2-nistp521-cert-v01@openssh.com,
+sk-ssh-ed25519-cert-v01@openssh.com,
 ssh-ed25519-cert-v01@openssh.com,
 rsa-sha2-512-cert-v01@openssh.com,
 rsa-sha2-256-cert-v01@openssh.com,
 ssh-rsa-cert-v01@openssh.com,
 sk-ecdsa-sha2-nistp256@openssh.com,
 ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+sk-ssh-ed25519@openssh.com,
 ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
 .Ed
 .Pp

diff --git a/sshd.8 b/sshd.8
index 14d5a2dacb5117d814fea78e78c4e3e9bbae068c..042610a03b0256eeabaece80a520c7996284dccc 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.305 2019/11/07 08:38:38 naddy Exp $
-.Dd $Mdocdate: November 7 2019 $
+.\" $OpenBSD: sshd.8,v 1.306 2019/11/18 04:55:02 djm Exp $
+.Dd $Mdocdate: November 18 2019 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -441,6 +441,8 @@ ecdsa-sha2-nistp384
 .It
 ecdsa-sha2-nistp521
 .It
+sk-ssh-ed25519@openssh.com
+.It
 ssh-ed25519
 .It
 ssh-dss
@@ -459,6 +461,7 @@ You don't want to type them in; instead, copy the
 .Pa id_ecdsa.pub ,
 .Pa id_ecdsa_sk.pub ,
 .Pa id_ed25519.pub ,
+.Pa id_ed25519_sk.pub ,
 or the
 .Pa id_rsa.pub
 file and edit it.

diff --git a/sshd_config.5 b/sshd_config.5
index f4caa162d4939cb2f249001af01b51774f21cccd..5052ca200a064e21341d44af2058be04940e1c20 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.291 2019/11/07 08:38:38 naddy Exp $
-.Dd $Mdocdate: November 7 2019 $
+.\" $OpenBSD: sshd_config.5,v 1.292 2019/11/18 04:55:02 djm Exp $
+.Dd $Mdocdate: November 18 2019 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1431,12 +1431,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
 ecdsa-sha2-nistp256-cert-v01@openssh.com,
 ecdsa-sha2-nistp384-cert-v01@openssh.com,
 ecdsa-sha2-nistp521-cert-v01@openssh.com,
+sk-ssh-ed25519-cert-v01@openssh.com,
 ssh-ed25519-cert-v01@openssh.com,
 rsa-sha2-512-cert-v01@openssh.com,
 rsa-sha2-256-cert-v01@openssh.com,
 ssh-rsa-cert-v01@openssh.com,
 sk-ecdsa-sha2-nistp256@openssh.com,
 ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+sk-ssh-ed25519@openssh.com,
 ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
 .Ed
 .Pp