summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-06-14 03:51:47 +0000
committerDamien Miller <djm@mindrot.org>2019-06-14 13:54:31 +1000
commitbe1da16e49da78a914dc2013cb664c0b4ea07199 (patch)
treeb66f7b69d14ef5a14d7693b643674a03e54a4742
parent85cf2488d44c31d467b32047c5323079eb33a1c2 (diff)
upstream: process agent requests for RSA certificate private keys usingV_8_0
correct signature algorithm when requested. Patch from Jakub Jelen in bz3016 ok dtucker markus OpenBSD-Commit-ID: 61f86efbeb4a1857a3e91298c1ccc6cf49b79624
-rw-r--r--ssh-agent.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index d06ecfd9..8e5550ac 100644
--- 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;
}