rsa: Do not do validity checks at runtime (in privcache load)

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 63816ee232b3638963bacc6b29a97fd477ae5ffa..be803b1161acaa4c5d1f41f4a0da4b7389279e2f 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -337,6 +337,9 @@ struct rsapriv_load_ctx {
        struct {
            struct cloc loc;
        } apply;
+       struct {
+           struct log_if *log;
+       } tryload;
     } u;
 };
 
@@ -391,8 +394,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 +439,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 +597,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,6 +621,59 @@ 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)
+{
+    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 void verror_cfgfatal(struct rsapriv_load_ctx *l,
                            FILE *maybe_f, bool_t unsup,
                            const char *message, va_list args)
@@ -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);
 }