rsa: rsa_loadpub_core: Make it take a load_ctx and use load_err

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 6ff8f781709dfa53eb58883588ac008e3139c4d9..7d5024922c4829e9dd94361fd4d6b0ec81a53ad5 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -48,12 +48,12 @@ struct rsacommon {
 #define FREE(b)                ({ free((b)); (b)=0; })
 
 struct load_ctx {
-    void (*verror)(struct load_ctx *l, const struct cloc *loc,
+    void (*verror)(struct load_ctx *l, struct cloc loc,
                   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;
+    struct cloc loc;
     union {
        struct {
            struct log_if *log;
@@ -67,12 +67,12 @@ static void load_err(struct load_ctx *l,
 {
     va_list al;
     va_start(al,fmt);
-    l->verror(l, maybe_loc ? maybe_loc : l->loc, maybe_f,unsup,fmt,al);
+    l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,unsup,fmt,al);
     va_end(al);
 }
 
 FORMAT(printf,5,0)
-static void verror_tryload(struct load_ctx *l, const struct cloc *loc,
+static void verror_tryload(struct load_ctx *l, struct cloc loc,
                           FILE *maybe_f, bool_t unsup,
                           const char *message, va_list args)
 {
@@ -81,11 +81,11 @@ static void verror_tryload(struct load_ctx *l, const struct cloc *loc,
     vslilog(l->u.tryload.log,class,message,args);
 }
 
-static void verror_cfgfatal(struct load_ctx *l, const struct cloc *loc,
+static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
                            FILE *maybe_f, bool_t unsup,
                            const char *message, va_list args)
 {
-    vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args);
+    vcfgfatal_maybefile(maybe_f,l->loc,l->what,message,args);
 }
 
 struct rsapriv {
@@ -319,8 +319,8 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
 static void rsapub_dispose(void *sst) {
     struct rsapub *st=sst;
 
-    mpz_clear(&st->e);
-    mpz_clear(&st->n);
+    if (!st) return;
+    RSAPUB_BNS(RSAPUB_CLEAR_ST_BN)
     rsacommon_dispose(&st->common);
     free(st);
 }
@@ -328,11 +328,10 @@ static void rsapub_dispose(void *sst) {
 #define RSAPUB_LOADCORE_DEFBN(ix,en,what) \
     const char *en##s, struct cloc en##_loc,
 
-#define LDPUBFATAL(enloc,...) \
-    cfgfatal(enloc, "rsa-public", __VA_ARGS__)
+#define LDPUBFATAL(lc,...) ({load_err(l,&lc,0,0,__VA_ARGS__); goto error_out;})
 
 static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
-                                      struct cloc overall_loc)
+                                      struct load_ctx *l)
 {
     struct rsapub *st;
 
@@ -348,7 +347,7 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
     st->ops.check=rsa_sig_check;
     st->ops.hash=0;
     st->ops.dispose=rsapub_dispose;
-    st->loc=overall_loc;
+    st->loc=l->loc;
     RSAPUB_BNS(RSAPUB_INIT_ST_BN)
 
 #define RSAPUB_LOADCORE_GETBN(ix,en,what)                              \
@@ -372,6 +371,11 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
 static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
                            list_t *args)
 {
+    struct load_ctx l[1];
+    l->verror=verror_cfgfatal;
+    l->postreadcheck=0;
+    l->what="rsa-public";
+    l->loc=loc;
 
 #define RSAPUB_APPLY_GETBN(ix,en,what)                         \
     item_t *en##i;                                             \
@@ -389,7 +393,7 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     RSAPUB_BNS(RSAPUB_APPLY_GETBN)
 
     struct rsapub *st=rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_PASSBN)
-                                      loc);
+                                      l);
 
     return new_closure(&st->cl);
 }
@@ -687,7 +691,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     l->what="rsa1priv load";
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
-    l->loc=&loc;
+    l->loc=loc;
     l->u.tryload.log=log;
 
     st=rsa_loadpriv_core(l,f,loc,False);
@@ -705,7 +709,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
 
 static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
 {
-    cfgfile_postreadcheck(*l->loc,f);
+    cfgfile_postreadcheck(l->loc,f);
     return True;
 }
 
@@ -721,7 +725,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     l->what="rsa-private";
     l->verror=verror_cfgfatal;
     l->postreadcheck=postreadcheck_apply;
-    l->loc=&loc;
+    l->loc=loc;
 
     /* Argument is filename pointing to SSH1 private key file */
     i=list_elem(args,0);