rsa: rsapub_dispose: Make passing 0 OK

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 964203650e4f1242499aa2e93d19d513b89ef730..48ce710e5de45d5ed87adb6335052abf2697f81a 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;
@@ -61,8 +61,18 @@ struct load_ctx {
     } u;
 };
 
+static void load_err(struct load_ctx *l,
+                    const struct cloc *maybe_loc, FILE *maybe_f,
+                    bool_t unsup, const char *fmt, ...)
+{
+    va_list al;
+    va_start(al,fmt);
+    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)
 {
@@ -71,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 {
@@ -309,6 +319,7 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
 static void rsapub_dispose(void *sst) {
     struct rsapub *st=sst;
 
+    if (!st) return;
     mpz_clear(&st->e);
     mpz_clear(&st->n);
     rsacommon_dispose(&st->common);
@@ -384,16 +395,6 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-static void load_err(struct load_ctx *l,
-                    const struct cloc *maybe_loc, FILE *maybe_f,
-                    bool_t unsup, const char *fmt, ...)
-{
-    va_list al;
-    va_start(al,fmt);
-    l->verror(l, maybe_loc ? maybe_loc : l->loc, maybe_f,unsup,fmt,al);
-    va_end(al);
-}
-
 #define LDFATAL(...)      ({ load_err(l,0,0,0,__VA_ARGS__); goto error_out; })
 #define LDUNSUP(...)      ({ load_err(l,0,0,1,__VA_ARGS__); goto error_out; })
 #define LDFATAL_FILE(...) ({ load_err(l,0,f,0,__VA_ARGS__); goto error_out; })
@@ -687,7 +688,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 +706,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 +722,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);