From: djm <djm@openbsd.org>
Date: Sat, 3 Apr 2021 06:55:52 +0000 (+0000)
Subject: sync CASignatureAlgorithms lists with reality. GHPR#174 from
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=577265342307bb0171751141d050d05c3a9fc3d5;p=openbsd

sync CASignatureAlgorithms lists with reality. GHPR#174 from
Matt Hazinski
---

diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 62dafc9ee2c..5202196bce5 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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.350 2021/03/12 05:18:01 jsg Exp $
-.Dd $Mdocdate: March 12 2021 $
+.\" $OpenBSD: ssh_config.5,v 1.351 2021/04/03 06:55:52 djm Exp $
+.Dd $Mdocdate: April 3 2021 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -372,8 +372,9 @@ Specifies which algorithms are allowed for signing of certificates
 by certificate authorities (CAs).
 The default is:
 .Bd -literal -offset indent
-ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,
-ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa
+ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,i
+rsa-sha2-512,rsa-sha2-256
 .Ed
 .Pp
 .Xr ssh 1
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index b9a44a7c108..e2509bb865f 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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.329 2021/03/12 04:08:19 dtucker Exp $
-.Dd $Mdocdate: March 12 2021 $
+.\" $OpenBSD: sshd_config.5,v 1.330 2021/04/03 06:55:52 djm Exp $
+.Dd $Mdocdate: April 3 2021 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -378,8 +378,9 @@ Specifies which algorithms are allowed for signing of certificates
 by certificate authorities (CAs).
 The default is:
 .Bd -literal -offset indent
-ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,
-ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa
+ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,i
+rsa-sha2-512,rsa-sha2-256
 .Ed
 .Pp
 Certificates signed using other algorithms will not be accepted for