rsa: sharing load_ctx: Code motion

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 63816ee232b3638963bacc6b29a97fd477ae5ffa..e4d62ad10f2c4b13ad60a5ad8ed63e1a7821cc5d 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -45,6 +45,38 @@ struct rsacommon {
     uint8_t *hashbuf;
 };
 
+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;
+};
+
+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 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);
+}
+
 struct rsapriv {
     closure_t cl;
     struct sigprivkey_if ops;
@@ -328,17 +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;
-    } u;
-};
+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);
+}
 
 #define LDFATAL(...)      ({ load_error(l,0,0,__VA_ARGS__); goto error_out; })
 #define LDUNSUP(...)      ({ load_error(l,0,1,__VA_ARGS__); goto error_out; })
@@ -369,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;
@@ -391,8 +411,7 @@ static void rsapriv_dispose(void *sst)
 
 static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
                                         FILE *f, struct cloc loc,
-                                        bool_t do_validity_check,
-                                        const char *filename)
+                                        bool_t do_validity_check)
 {
     struct rsapriv *st=0;
     long length;
@@ -437,8 +456,7 @@ static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
     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"
-                          " string from SSH1 private keyfile \"%s\"\n",
-                          filename);
+                    " string from SSH1 private keyfile\n");
     }
     FREE(b);
 
@@ -596,8 +614,8 @@ static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
     
 done_checks:
     if (!valid) {
-       LDFATAL("file \"%s\" does not contain a "
-                "valid RSA key!\n",filename);
+       LDFATAL("file does not contain a "
+                "valid RSA key!\n");
     }
 
 assume_valid:
@@ -620,11 +638,47 @@ error_out:
     goto out;
 }
 
-static void verror_cfgfatal(struct rsapriv_load_ctx *l,
-                           FILE *maybe_f, bool_t unsup,
-                           const char *message, va_list args)
+static bool_t postreadcheck_tryload(struct rsapriv_load_ctx *l, FILE *f)
 {
-    vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args);
+    assert(!ferror(f));
+    if (feof(f)) { load_error(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,
+                    struct log_if *log)
+{
+    FILE *f=0;
+    struct rsapriv *st=0;
+
+    f=fmemopen(privkeydata->start,privkeydata->size,"r");
+    if (!f) {
+       slilog(log,M_ERR,"failed to fmemopen private key file\n");
+       goto error_out;
+    }
+
+    struct cloc loc;
+    loc.file="dynamically loaded";
+    loc.line=0;
+
+    struct rsapriv_load_ctx l[1];
+    l->verror=verror_tryload;
+    l->postreadcheck=postreadcheck_tryload;
+    l->u.tryload.log=log;
+
+    st=rsa_loadpriv_core(l,f,loc,False);
+    if (!st) goto error_out;
+    goto out;
+
+ error_out:
+    if (st) { free(st); st=0; }
+ out:
+    if (f) fclose(f);
+    if (!st) return False;
+    *sigpriv_r=&st->ops;
+    return True;
 }
 
 static bool_t postreadcheck_apply(struct rsapriv_load_ctx *l, FILE *f)
@@ -678,7 +732,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
        do_validity_check=False;
     }
 
-    st=rsa_loadpriv_core(l,f,loc,do_validity_check,filename);
+    st=rsa_loadpriv_core(l,f,loc,do_validity_check);
     fclose(f);
     return new_closure(&st->cl);
 }