rsa: LDPUBFATAL: Move & before lc into callers

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 48ce710e5de45d5ed87adb6335052abf2697f81a..3770aa6571608c01086d71041c6bdf93bb46534e 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -320,8 +320,7 @@ static void rsapub_dispose(void *sst) {
     struct rsapub *st=sst;
 
     if (!st) return;
-    mpz_clear(&st->e);
-    mpz_clear(&st->n);
+    RSAPUB_BNS(RSAPUB_CLEAR_ST_BN)
     rsacommon_dispose(&st->common);
     free(st);
 }
@@ -329,11 +328,13 @@ 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;
 
@@ -349,16 +350,16 @@ 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)                              \
     if (mpz_init_set_str(&st->en,en##s,10)!=0) {                       \
-       LDPUBFATAL(en##_loc, what " \"%s\" is not a "                   \
+       LDPUBFATAL(&en##_loc, what " \"%s\" is not a "                  \
                 "decimal number string\n",en##s);                      \
     }                                                                  \
     if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) {             \
-       LDPUBFATAL(en##_loc, "implausibly large " what "\n");           \
+       LDPUBFATAL(&en##_loc, "implausibly large " what "\n");          \
     }
 
     RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
@@ -373,6 +374,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;                                             \
@@ -390,7 +396,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);
 }