summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-07-03 13:20:25 +0000
committerDamien Miller <djm@mindrot.org>2018-07-03 23:26:47 +1000
commitb4d4eda633af433d20232cbf7e855ceac8b83fe5 (patch)
tree40b912d5b34fcea72cf9de81fc19b4cb8f6c9864 /sshkey.c
parentd78b75df4a57e0f92295f24298e5f2930e71c172 (diff)
upstream: some finesse to fix RSA-SHA2 certificate authentication
for certs hosted in ssh-agent OpenBSD-Commit-ID: e5fd5edd726137dda2d020e1cdebc464110a010f
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshkey.c b/sshkey.c
index 455cf3d6..72c08c7e 100644
--- a/sshkey.c
+++ b/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.
@@ -2244,8 +2244,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;
@@ -2276,7 +2276,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;