From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 23 Nov 2019 10:51:53 +0000 (+0000)
Subject: pubkeys: Pass a cloc to loadpub
X-Git-Tag: v0.6.0~188
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=8edfb13017ffb9706dfec817743d6227c300d540;p=secnet.git

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 38ddffd..f0e8d58 100755
--- 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 7c650a9..0d5b839 100644
--- 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) */