rsa: sharing load_ctx: Introduce what

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 3b4eea8dbdc424fd03f3f9a1bde722bf7484ac9f..3ce72b86fcdbbb3b609cf092943a7eb38f3614c3 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -50,10 +50,9 @@ struct load_ctx {
                   FILE *maybe_f, bool_t unsup,
                   const char *message, va_list args);
     bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
+    const char *what;
+    struct cloc *loc;
     union {
-       struct {
-           struct cloc loc;
-       } apply;
        struct {
            struct log_if *log;
        } tryload;
@@ -66,7 +65,7 @@ static void verror_tryload(struct load_ctx *l,
                           const char *message, va_list args)
 {
     int class=unsup ? M_DEBUG : M_ERR;
-    slilog_part(l->u.tryload.log,class,"rsa1priv load: ");
+    slilog_part(l->u.tryload.log,class,"%s: ",l->what);
     vslilog(l->u.tryload.log,class,message,args);
 }
 
@@ -74,7 +73,7 @@ static void verror_cfgfatal(struct load_ctx *l,
                            FILE *maybe_f, bool_t unsup,
                            const char *message, va_list args)
 {
-    vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args);
+    vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args);
 }
 
 struct rsapriv {
@@ -648,7 +647,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;
@@ -659,13 +658,11 @@ 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->what="rsa1priv load";
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
+    l->loc=&loc;
     l->u.tryload.log=log;
 
     st=rsa_loadpriv_core(l,f,loc,False);
@@ -683,7 +680,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
 
 static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
 {
-    cfgfile_postreadcheck(l->u.apply.loc,f);
+    cfgfile_postreadcheck(*l->loc,f);
     return True;
 }
 
@@ -696,9 +693,10 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     FILE *f;
     struct load_ctx l[1];
 
+    l->what="rsa-private";
     l->verror=verror_cfgfatal;
     l->postreadcheck=postreadcheck_apply;
-    l->u.apply.loc=loc;
+    l->loc=&loc;
 
     /* Argument is filename pointing to SSH1 private key file */
     i=list_elem(args,0);