rsa: Provide dict context argument in load_ctx

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 3f2fbd158cc4d07940c598d3fa0629c852ac3ac9..145df5e464fc98b431534fed0dc49e2ff614f65a 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -49,10 +49,11 @@ struct rsacommon {
 
 struct load_ctx {
     void (*verror)(struct load_ctx *l, struct cloc loc,
-                  FILE *maybe_f, bool_t unsup,
+                  FILE *maybe_f,
                   const char *message, va_list args);
     bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
     const char *what;
+    dict_t *deprdict; /* used only to look up hash */
     struct cloc loc;
     union {
        struct {
@@ -63,29 +64,29 @@ struct load_ctx {
 
 static void load_err(struct load_ctx *l,
                     const struct cloc *maybe_loc, FILE *maybe_f,
-                    bool_t unsup, const char *fmt, ...)
+                    const char *fmt, ...)
 {
     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,fmt,al);
     va_end(al);
 }
 
-FORMAT(printf,5,0)
+FORMAT(printf,4,0)
 static void verror_tryload(struct load_ctx *l, struct cloc loc,
-                          FILE *maybe_f, bool_t unsup,
+                          FILE *maybe_f,
                           const char *message, va_list args)
 {
-    int class=unsup ? M_DEBUG : M_ERR;
+    int class=M_ERR;
     slilog_part(l->u.tryload.log,class,"%s: ",l->what);
     vslilog(l->u.tryload.log,class,message,args);
 }
 
 static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
-                           FILE *maybe_f, bool_t unsup,
+                           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 {
@@ -329,7 +330,7 @@ static void rsapub_dispose(void *sst) {
     const char *en##s, struct cloc en##_loc,
 
 #define LDPUBFATAL(lc,...) ({                  \
-       load_err(l,(lc),0,0,__VA_ARGS__);       \
+       load_err(l,(lc),0,__VA_ARGS__); \
        goto error_out;                         \
     })
 
@@ -356,10 +357,10 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
 #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 "                  \
-                "decimal number string\n",en##s);                      \
+                "decimal number string",en##s);                        \
     }                                                                  \
     if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) {             \
-       LDPUBFATAL(&en##_loc, "implausibly large " what "\n");          \
+       LDPUBFATAL(&en##_loc, "implausibly large " what);               \
     }
 
     RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
@@ -378,6 +379,7 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     l->verror=verror_cfgfatal;
     l->postreadcheck=0;
     l->what="rsa-public";
+    l->deprdict=context;
     l->loc=loc;
 
 #define RSAPUB_APPLY_GETBN(ix,en,what)                         \
@@ -404,6 +406,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;
@@ -412,6 +415,7 @@ bool_t rsa1_loadpub(const struct sigscheme_info *algo,
     l->verror=verror_tryload;
     l->postreadcheck=0;
     l->what="rsa1_loadpub";
+    l->deprdict=0;
     l->loc=loc;
     l->u.tryload.log=log;
 
@@ -434,6 +438,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:
@@ -441,10 +446,8 @@ bool_t rsa1_loadpub(const struct sigscheme_info *algo,
     return False;
 }
 
-#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; })
-#define LDUNSUP_FILE(...) ({ load_err(l,0,f,1,__VA_ARGS__); goto error_out; })
+#define LDFATAL(...)      ({ load_err(l,0,0,__VA_ARGS__); goto error_out; })
+#define LDFATAL_FILE(...) ({ load_err(l,0,f,__VA_ARGS__); goto error_out; })
 #define KEYFILE_GET(is)   ({                                   \
        uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f);     \
        if (!l->postreadcheck(l,f)) goto error_out;             \
@@ -526,7 +529,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     length=strlen(AUTHFILE_ID_STRING)+1;
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1 || memcmp(b,AUTHFILE_ID_STRING,length)!=0) {
-       LDUNSUP_FILE("failed to read magic ID"
+       LDFATAL_FILE("failed to read magic ID"
                     " string from SSH1 private keyfile\n");
     }
     FREE(b);
@@ -534,7 +537,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     cipher_type=fgetc(f);
     KEYFILE_GET(32); /* "Reserved data" */
     if (cipher_type != 0) {
-       LDUNSUP("we don't support encrypted keyfiles\n");
+       LDFATAL("we don't support encrypted keyfiles\n");
     }
 
     /* Read the public key */
@@ -712,13 +715,14 @@ error_out:
 static bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f)
 {
     assert(!ferror(f));
-    if (feof(f)) { load_err(l,0,0,0,"eof mid-integer"); return False; }
+    if (feof(f)) { load_err(l,0,0,"eof mid-integer"); return False; }
     return True;
 }
 
 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;
@@ -734,6 +738,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     l->what="rsa1priv load";
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
+    l->deprdict=0;
     l->loc=loc;
     l->u.tryload.log=log;
 
@@ -747,6 +752,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;
 }
 
@@ -768,6 +774,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->deprdict=context;
     l->loc=loc;
 
     /* Argument is filename pointing to SSH1 private key file */