diff options
| author |   djm <djm@openbsd.org> | 2019-06-14 03:51:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-06-14 03:51:47 +0000 |
| commit | 1537b9ed2f0957992b916e9745feee37134fa120 (patch) | |
| tree | 952fbd6b86333a6119bf709cadae180bb6e1b8be /usr.bin/ssh/ssh-agent.c | |
| parent | Add a barrier after arming a completion queue. If multiple cqs are using (diff) | |
| download | wireguard-openbsd-1537b9ed2f0957992b916e9745feee37134fa120.tar.xz wireguard-openbsd-1537b9ed2f0957992b916e9745feee37134fa120.zip | |
process agent requests for RSA certificate private keys using correct
signature algorithm when requested. Patch from Jakub Jelen in bz3016
ok dtucker markus
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 1efb3e56954..ee1d42546cd 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.234 2019/06/06 05:13:13 otto Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.235 2019/06/14 03:51:47 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -254,6 +254,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; } |