rsa: sharing load_ctx: Rename load_ctx

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 28f9d865b2db2048b5f64c21683c0845f7f87cc1..3b4eea8dbdc424fd03f3f9a1bde722bf7484ac9f 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -45,6 +45,38 @@ struct rsacommon {
     uint8_t *hashbuf;
 };
 
+struct load_ctx {
+    void (*verror)(struct load_ctx *l,
+                  FILE *maybe_f, bool_t unsup,
+                  const char *message, va_list args);
+    bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
+    union {
+       struct {
+           struct cloc loc;
+       } apply;
+       struct {
+           struct log_if *log;
+       } tryload;
+    } u;
+};
+
+FORMAT(printf,4,0)
+static void verror_tryload(struct load_ctx *l,
+                          FILE *maybe_f, bool_t unsup,
+                          const char *message, va_list args)
+{
+    int class=unsup ? M_DEBUG : M_ERR;
+    slilog_part(l->u.tryload.log,class,"rsa1priv load: ");
+    vslilog(l->u.tryload.log,class,message,args);
+}
+
+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);
+}
+
 struct rsapriv {
     closure_t cl;
     struct sigprivkey_if ops;
@@ -328,20 +360,14 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-struct rsapriv_load_ctx {
-    void (*verror)(struct rsapriv_load_ctx *l,
-                  FILE *maybe_f, bool_t unsup,
-                  const char *message, va_list args);
-    bool_t (*postreadcheck)(struct rsapriv_load_ctx *l, FILE *f);
-    union {
-       struct {
-           struct cloc loc;
-       } apply;
-       struct {
-           struct log_if *log;
-       } tryload;
-    } u;
-};
+static void load_error(struct load_ctx *l, FILE *maybe_f,
+                      bool_t unsup, const char *fmt, ...)
+{
+    va_list al;
+    va_start(al,fmt);
+    l->verror(l,maybe_f,unsup,fmt,al);
+    va_end(al);
+}
 
 #define LDFATAL(...)      ({ load_error(l,0,0,__VA_ARGS__); goto error_out; })
 #define LDUNSUP(...)      ({ load_error(l,0,1,__VA_ARGS__); goto error_out; })
@@ -354,7 +380,7 @@ struct rsapriv_load_ctx {
        keyfile_get_tmp;                                        \
     })
 
-static uint32_t keyfile_get_32(struct rsapriv_load_ctx *l, FILE *f)
+static uint32_t keyfile_get_32(struct load_ctx *l, FILE *f)
 {
     uint32_t r;
     r=fgetc(f)<<24;
@@ -364,7 +390,7 @@ static uint32_t keyfile_get_32(struct rsapriv_load_ctx *l, FILE *f)
     return r;
 }
 
-static uint16_t keyfile_get_16(struct rsapriv_load_ctx *l, FILE *f)
+static uint16_t keyfile_get_16(struct load_ctx *l, FILE *f)
 {
     uint16_t r;
     r=fgetc(f)<<8;
@@ -372,15 +398,6 @@ static uint16_t keyfile_get_16(struct rsapriv_load_ctx *l, FILE *f)
     return r;
 }
 
-static void load_error(struct rsapriv_load_ctx *l, FILE *maybe_f,
-                      bool_t unsup, const char *fmt, ...)
-{
-    va_list al;
-    va_start(al,fmt);
-    l->verror(l,maybe_f,unsup,fmt,al);
-    va_end(al);
-}
-
 static void rsapriv_dispose(void *sst)
 {
     struct rsapriv *st=sst;
@@ -392,7 +409,7 @@ static void rsapriv_dispose(void *sst)
     free(st);
 }
 
-static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
+static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
                                         FILE *f, struct cloc loc,
                                         bool_t do_validity_check)
 {
@@ -621,17 +638,7 @@ error_out:
     goto out;
 }
 
-FORMAT(printf,4,0)
-static void verror_tryload(struct rsapriv_load_ctx *l,
-                          FILE *maybe_f, bool_t unsup,
-                          const char *message, va_list args)
-{
-    int class=unsup ? M_DEBUG : M_ERR;
-    slilog_part(l->u.tryload.log,class,"rsa1priv load: ");
-    vslilog(l->u.tryload.log,class,message,args);
-}
-
-static bool_t postreadcheck_tryload(struct rsapriv_load_ctx *l, FILE *f)
+static bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f)
 {
     assert(!ferror(f));
     if (feof(f)) { load_error(l,0,0,"eof mid-integer"); return False; }
@@ -656,12 +663,12 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     loc.file="dynamically loaded";
     loc.line=0;
 
-    struct rsapriv_load_ctx l[1];
+    struct load_ctx l[1];
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
     l->u.tryload.log=log;
 
-    st=rsa_loadpriv_core(l,f,loc,True);
+    st=rsa_loadpriv_core(l,f,loc,False);
     if (!st) goto error_out;
     goto out;
 
@@ -674,14 +681,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     return True;
 }
 
-static void verror_cfgfatal(struct rsapriv_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);
-}
-
-static bool_t postreadcheck_apply(struct rsapriv_load_ctx *l, FILE *f)
+static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
 {
     cfgfile_postreadcheck(l->u.apply.loc,f);
     return True;
@@ -694,7 +694,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *i;
     cstring_t filename;
     FILE *f;
-    struct rsapriv_load_ctx l[1];
+    struct load_ctx l[1];
 
     l->verror=verror_cfgfatal;
     l->postreadcheck=postreadcheck_apply;