diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-12-27 23:02:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-12-28 10:12:53 +1100 |
commit | f429c1b2ef631f2855e51a790cf71761d752bbca (patch) | |
tree | 27dcb20a27d72ed3600cebcd6ef06eb6821e4c43 | |
parent | 4608a60cb4893a25490fd88ffdaaae6256381ae3 (diff) | |
download | openssh-git-V_7_9.tar.gz |
upstream: Request RSA-SHA2 signatures forV_7_9
rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033
-rw-r--r-- | authfd.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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; |