X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rsa.c;h=3f6c7f92f8ea57e4c999cb0ff09a9b4a59e2f49b;hb=cfa89389d4ffbb8f28dcc15a3caa702fe9fc50fe;hp=9cd12ba4ee0a069967733413e1f0559c5b00ed0b;hpb=5107cdb29153a45935e675441e1949eec2babff8;p=secnet.git

diff --git a/rsa.c b/rsa.c
index 9cd12ba..3f6c7f9 100644
--- a/rsa.c
+++ b/rsa.c
@@ -85,7 +85,7 @@ static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
 			    FILE *maybe_f,
 			    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 {
@@ -404,6 +404,7 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
 bool_t rsa1_loadpub(const struct sigscheme_info *algo,
 		    struct buffer_if *pubkeydata,
 		    struct sigpubkey_if **sigpub_r,
+		    closure_t **closure_r,
 		    struct log_if *log, struct cloc loc)
 {
     struct rsapub *st=0;
@@ -434,6 +435,7 @@ bool_t rsa1_loadpub(const struct sigscheme_info *algo,
     if (!st) goto error_out;
 
     *sigpub_r=&st->ops;
+    *closure_r=&st->cl;
     return True;
 
  error_out:
@@ -717,6 +719,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,
+		     closure_t **closure_r,
 		     struct log_if *log, struct cloc loc)
 {
     FILE *f=0;
@@ -745,6 +748,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     if (f) fclose(f);
     if (!st) return False;
     *sigpriv_r=&st->ops;
+    *closure_r=&st->cl;
     return True;
 }