Request RSA-SHA2 signatures for corresponding cert algorithms

Closes: #923419

5 files changed, 50 insertions, 5 deletions

diff --git a/authfd.c b/authfd.c
index ecdd869ab..62cbf8c19 100644
--- a/authfd.c
+++ b/authfd.c
@@ -327,10 +327,12 @@ ssh_free_identitylist(struct ssh_identitylist *idl)
 static u_int
 agent_encode_alg(const struct sshkey *key, const char *alg)
 {
-        if (alg != NULL && key->type == KEY_RSA) {
-                if (strcmp(alg, "rsa-sha2-256") == 0)
+        if (alg != NULL && sshkey_type_plain(key->type) == KEY_RSA) {
+                if (strcmp(alg, "rsa-sha2-256") == 0 ||
+                    strcmp(alg, "rsa-sha2-256-cert-v01@openssh.com") == 0)
                         return SSH_AGENT_RSA_SHA2_256;
-                else if (strcmp(alg, "rsa-sha2-512") == 0)
+                if (strcmp(alg, "rsa-sha2-512") == 0 ||
+                    strcmp(alg, "rsa-sha2-512-cert-v01@openssh.com") == 0)
                         return SSH_AGENT_RSA_SHA2_512;
         }
         return 0;
diff --git a/debian/.git-dpm b/debian/.git-dpm
index a45865db0..42208f2de 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-5e021158aa22cc64da4fca1618ee0bfd2d031049
-5e021158aa22cc64da4fca1618ee0bfd2d031049
+d94226d4fcefbc398c5583e12b5d07ca33884ba4
+d94226d4fcefbc398c5583e12b5d07ca33884ba4
 3d246f10429fc9a37b98eabef94fe8dc7c61002b
 3d246f10429fc9a37b98eabef94fe8dc7c61002b
 openssh_7.9p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index ce7ec26fe..75d338a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:7.9p1-8) UNRELEASED; urgency=medium
   * Apply upstream patch to fix bug in HostbasedAcceptedKeyTypes and
     PubkeyAcceptedKeyTypes options in the case where only RSA-SHA2 signature
     types were specified.
+  * Apply upstream patch to request RSA-SHA2 signatures for
+    rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes:
+    #923419).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 28 Feb 2019 10:33:32 +0000
 
diff --git a/debian/patches/request-rsa-sha2-cert-signatures.patch b/debian/patches/request-rsa-sha2-cert-signatures.patch
new file mode 100644
index 000000000..2c876be31
--- /dev/null
+++ b/debian/patches/request-rsa-sha2-cert-signatures.patch
@@ -0,0 +1,39 @@
+From d94226d4fcefbc398c5583e12b5d07ca33884ba4 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Thu, 27 Dec 2018 23:02:11 +0000
+Subject: upstream: Request RSA-SHA2 signatures for
+
+rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
+
+OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033
+
+Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=f429c1b2ef631f2855e51a790cf71761d752bbca
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2944
+Bug-Debian: https://bugs.debian.org/923419
+Last-Update: 2019-02-28
+
+Patch-Name: request-rsa-sha2-cert-signatures.patch
+---
+ authfd.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index ecdd869ab..62cbf8c19 100644
+--- a/authfd.c
++++ b/authfd.c
+@@ -327,10 +327,12 @@ ssh_free_identitylist(struct ssh_identitylist *idl)
+ static u_int
+ agent_encode_alg(const struct sshkey *key, const char *alg)
+ {
+-       if (alg != NULL && key->type == KEY_RSA) {
+-               if (strcmp(alg, "rsa-sha2-256") == 0)
++       if (alg != NULL && sshkey_type_plain(key->type) == KEY_RSA) {
++               if (strcmp(alg, "rsa-sha2-256") == 0 ||
++                   strcmp(alg, "rsa-sha2-256-cert-v01@openssh.com") == 0)
+                        return SSH_AGENT_RSA_SHA2_256;
+-               else if (strcmp(alg, "rsa-sha2-512") == 0)
++               if (strcmp(alg, "rsa-sha2-512") == 0 ||
++                   strcmp(alg, "rsa-sha2-512-cert-v01@openssh.com") == 0)
+                        return SSH_AGENT_RSA_SHA2_512;
+        }
+        return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 12358dcf0..a95dccaa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ sanitize-scp-filenames-via-snmprintf.patch
 have-progressmeter-force-update-at-beginning-and-end-transfer.patch
 check-filenames-in-scp-client.patch
 fix-key-type-check.patch
+request-rsa-sha2-cert-signatures.patch