Commit 9dbca13b authored by Niels Möller's avatar Niels Möller

(spki_make_verifier): New third argument for

returning the name of the algorithm. Updated callers.

Rev: src/spki.c:1.58
Rev: src/spki.h:1.32
parent 1c868042
......@@ -125,7 +125,8 @@ spki_algorithm_lookup(struct alist *algorithms,
struct verifier *
spki_make_verifier(struct alist *algorithms,
struct sexp_iterator *i)
struct sexp_iterator *i,
int *type)
{
/* Syntax: (<algorithm> <s-expr>*) */
struct signature_algorithm *algorithm;
......@@ -133,7 +134,7 @@ spki_make_verifier(struct alist *algorithms,
{
CAST_SUBTYPE(signature_algorithm, a,
spki_algorithm_lookup(algorithms, i, NULL));
spki_algorithm_lookup(algorithms, i, type));
algorithm = a;
}
......@@ -263,7 +264,7 @@ spki_lookup(struct spki_context *self,
if (v)
principal->verifier = v;
else
principal->verifier = spki_make_verifier(self->algorithms, &sexp);
principal->verifier = spki_make_verifier(self->algorithms, &sexp, NULL);
}
return principal;
......
......@@ -43,7 +43,8 @@ make_ssh_hostkey_tag(const char *host);
struct verifier *
spki_make_verifier(struct alist *algorithms,
struct sexp_iterator *i);
struct sexp_iterator *i,
int *algorithm_name);
struct signer *
spki_sexp_to_signer(struct alist *algorithms,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment