upstream: process agent requests for RSA certificate private keys using

correct signature algorithm when requested. Patch from Jakub Jelen in bz3016
ok dtucker markus

OpenBSD-Commit-ID: 61f86efbeb4a1857a3e91298c1ccc6cf49b79624

diff --git a/ssh-agent.c b/ssh-agent.c
index d06ecfd98a9a508133b704e4671f370449250d1a..8e5550ac33626043d2b1e6dfb2ced0c7ab34c894 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -269,6 +269,11 @@ agent_decode_alg(struct sshkey *key, u_int flags)
                        return "rsa-sha2-256";
                else if (flags & SSH_AGENT_RSA_SHA2_512)
                        return "rsa-sha2-512";
+       } else if (key->type == KEY_RSA_CERT) {
+               if (flags & SSH_AGENT_RSA_SHA2_256)
+                       return "rsa-sha2-256-cert-v01@openssh.com";
+               else if (flags & SSH_AGENT_RSA_SHA2_512)
+                       return "rsa-sha2-512-cert-v01@openssh.com";
        }
        return NULL;
 }