diff options
| author |   djm <djm@openbsd.org> | 2018-07-03 13:20:25 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-07-03 13:20:25 +0000 |
| commit | d443285fb583f28c1e5ba1b3f0dc5405648b7e71 (patch) | |
| tree | 9a80bce72fe66ede9fad1fa45b177782f297aaf8 /usr.bin/ssh/sshkey.c | |
| parent | check correct variable; unbreak agent keys (diff) | |
| download | wireguard-openbsd-d443285fb583f28c1e5ba1b3f0dc5405648b7e71.tar.xz wireguard-openbsd-d443285fb583f28c1e5ba1b3f0dc5405648b7e71.zip | |
some finesse to fix RSA-SHA2 certificate authentication for certs
hosted in ssh-agent
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index e9c641ad3f7..a1d4b1e2e5a 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.65 2018/07/03 11:39:54 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.66 2018/07/03 13:20:25 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2198,8 +2198,8 @@ get_sigtype(const u_char *sig, size_t siglen, char **sigtypep) /* * Returns the expected signature algorithm for a given public key algorithm. */ -static const char * -sigalg_by_name(const char *name) +const char * +sshkey_sigalg_by_name(const char *name) { const struct keytype *kt; @@ -2230,7 +2230,7 @@ sshkey_check_sigtype(const u_char *sig, size_t siglen, if (requested_alg == NULL) return 0; - if ((expected_alg = sigalg_by_name(requested_alg)) == NULL) + if ((expected_alg = sshkey_sigalg_by_name(requested_alg)) == NULL) return SSH_ERR_INVALID_ARGUMENT; if ((r = get_sigtype(sig, siglen, &sigtype)) != 0) return r; |