upstream: expose allowed_signers options parsing code in header for
fuzzing
rename to make more consistent with philosophically-similar auth
options parsing API.
OpenBSD-Commit-ID: 0c67600ef04187f98e2912ca57b60c22a8025b7c
diff --git a/sshsig.c b/sshsig.c
index ab9fe43..bda57b3 100644
--- a/sshsig.c
+++ b/sshsig.c
@@ -605,16 +605,16 @@
return r;
}
-struct sigopts {
+struct sshsigopt {
int ca;
char *namespaces;
};
-static struct sigopts *
-sigopts_parse(const char *opts, const char *path, u_long linenum,
+struct sshsigopt *
+sshsigopt_parse(const char *opts, const char *path, u_long linenum,
const char **errstrp)
{
- struct sigopts *ret;
+ struct sshsigopt *ret;
int r;
const char *errstr = NULL;
@@ -662,8 +662,8 @@
return NULL;
}
-static void
-sigopts_free(struct sigopts *opts)
+void
+sshsigopt_free(struct sshsigopt *opts)
{
if (opts == NULL)
return;
@@ -680,7 +680,7 @@
char *cp, *opts = NULL, *identities = NULL;
int r, found = 0;
const char *reason = NULL;
- struct sigopts *sigopts = NULL;
+ struct sshsigopt *sigopts = NULL;
if ((found_key = sshkey_new(KEY_UNSPEC)) == NULL) {
error("%s: sshkey_new failed", __func__);
@@ -720,7 +720,7 @@
}
}
debug3("%s:%lu: options %s", path, linenum, opts == NULL ? "" : opts);
- if ((sigopts = sigopts_parse(opts, path, linenum, &reason)) == NULL) {
+ if ((sigopts = sshsigopt_parse(opts, path, linenum, &reason)) == NULL) {
error("%s:%lu: bad options: %s", path, linenum, reason);
goto done;
}
@@ -756,7 +756,7 @@
}
done:
sshkey_free(found_key);
- sigopts_free(sigopts);
+ sshsigopt_free(sigopts);
return found ? 0 : SSH_ERR_KEY_NOT_FOUND;
}