pubkeys: Pass a cloc to loadpub

This will be used for error reporting.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/pubkeys.fl.pl b/pubkeys.fl.pl
index 38ddffd34bc122c24170a7dcef1caaddcac1be0c..f0e8d58c3364f7702117635a009377e1a96080b1 100755 (executable)
--- a/pubkeys.fl.pl
+++ b/pubkeys.fl.pl
@@ -227,7 +227,7 @@ static struct pubkeyset_context c[1];
     if (c->building->nkeys >= MAX_SIG_KEYS) DOSKIP("too many public keys");
     struct sigpubkey_if *pubkey;
     bool_t ok=c->scheme->loadpub(c->scheme,c->data_buf,
-                                &pubkey,c->log);
+                                &pubkey,c->log,c->loc);
     if (!ok) break;
     memcpy(c->building->keys[c->building->nkeys].id.b,
           c->grpid,

diff --git a/secnet.h b/secnet.h
index 7c650a9459f54e9ef2d0684fc1a4cad6911b6509..0d5b8396d9abf95e63c6a8f56c6d12b5c88ae3b8 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -404,7 +404,7 @@ struct sigscheme_info;
 typedef bool_t sigscheme_loadpub(const struct sigscheme_info *algo,
                                 struct buffer_if *pubkeydata,
                                 struct sigpubkey_if **sigpub_r,
-                                struct log_if *log);
+                                struct log_if *log, struct cloc loc);
   /* pubkeydata is (supposedly) for this algorithm.
    * loadpub should log an error if it fails.
    * pubkeydata may be modified (but not freed) */