From 52893bf3a9ac6bca4d39c15d003de3f405e9de63 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 23 Nov 2019 12:26:46 +0000 Subject: [PATCH] privcache: Pass a cloc to loadpriv and use it Signed-off-by: Ian Jackson --- privcache.c | 3 ++- rsa.c | 6 +----- secnet.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/privcache.c b/privcache.c index 0c10197..81b04fc 100644 --- a/privcache.c +++ b/privcache.c @@ -78,7 +78,8 @@ static struct sigprivkey_if *uncached_get(struct privcache *st, scheme++) { st->databuf.start=st->databuf.base; st->databuf.size=got; - ok=scheme->loadpriv(scheme, &st->databuf, &sigpriv, log); + struct cloc loc = { .file=st->path.buffer, .line=0 }; + ok=scheme->loadpriv(scheme, &st->databuf, &sigpriv, log, loc); if (ok) { if (sigpriv->sethash) { if (!st->defhash) { diff --git a/rsa.c b/rsa.c index 14d7050..18b4f3f 100644 --- a/rsa.c +++ b/rsa.c @@ -646,7 +646,7 @@ static bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f) bool_t rsa1_loadpriv(const struct sigscheme_info *algo, struct buffer_if *privkeydata, struct sigprivkey_if **sigpriv_r, - struct log_if *log) + struct log_if *log, struct cloc loc) { FILE *f=0; struct rsapriv *st=0; @@ -657,10 +657,6 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo, goto error_out; } - struct cloc loc; - loc.file="dynamically loaded"; - loc.line=0; - struct load_ctx l[1]; l->verror=verror_tryload; l->postreadcheck=postreadcheck_tryload; diff --git a/secnet.h b/secnet.h index 1a26e74..7a93ce8 100644 --- a/secnet.h +++ b/secnet.h @@ -412,7 +412,7 @@ typedef bool_t sigscheme_loadpub(const struct sigscheme_info *algo, typedef bool_t sigscheme_loadpriv(const struct sigscheme_info *algo, struct buffer_if *privkeydata, struct sigprivkey_if **sigpriv_r, - struct log_if *log); + struct log_if *log, struct cloc loc); /* privkeydata may contain data for any algorithm, not necessarily * this one! If it is not for this algorithm, return False and do * not log anything (other than at M_DEBUG). If it *is* for this -- 2.30.2