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:06:50 +1100 |
| commit | 007a88b48c97d092ed2f501bbdcb70d9925277be (patch) | |
| tree | 81924244c64b31bbd6c74dab909dda2b49a7898c /authfd.c | |
| parent | eb347d086c35428c47fe52b34588cbbc9b49d9a6 (diff) | |
upstream: Request RSA-SHA2 signatures for
rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033
Diffstat (limited to 'authfd.c')
| -rw-r--r-- | authfd.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.c,v 1.112 2018/11/30 02:24:52 djm Exp $ */ +/* $OpenBSD: authfd.c,v 1.113 2018/12/27 23:02:11 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -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; |