1 files 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;