X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=rsa.c;h=6a89b21156242eba81ac7dfa78b4904106e1b2aa;hb=503cd8a1792a51fea0cb1d474e646cb6978633ff;hp=f386b41ce200f688d0838b7f0db3baa004697009;hpb=87af7c8c0f58eea212ec1207d0d343a509c5e7df;p=secnet.git

diff --git a/rsa.c b/rsa.c
index f386b41..6a89b21 100644
--- 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,17 +64,17 @@ 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=M_ERR;
@@ -82,10 +83,10 @@ static void verror_tryload(struct load_ctx *l, struct cloc loc,
 }
 
 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 {
@@ -127,23 +128,19 @@ struct rsapub {
 
 static const char *hexchars="0123456789abcdef";
 
-static void rsa_sethash(struct rsacommon *c, struct hash_if *hash,
+static void rsa_sethash(struct load_ctx *l,
+			struct rsacommon *c,
 			const struct hash_if **in_ops)
 {
-    free(c->hashbuf);
+    struct hash_if *hash=0;
+    if (l->deprdict)
+	hash=find_cl_if(l->deprdict,"hash",CL_HASH,False,"site",l->loc);
+    if (!hash)
+	hash=sha1_hash_if;
     c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
     *in_ops=hash;
 }
-static void rsa_pub_sethash(void *sst, struct hash_if *hash)
-{
-    struct rsapub *st=sst;
-    rsa_sethash(&st->common, hash, &st->ops.hash);
-}
-static void rsa_priv_sethash(void *sst, struct hash_if *hash)
-{
-    struct rsapriv *st=sst;
-    rsa_sethash(&st->common, hash, &st->ops.hash);
-}
+
 static void rsacommon_dispose(struct rsacommon *c)
 {
     free(c->hashbuf);
@@ -329,7 +326,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;				\
     })
 
@@ -344,7 +341,6 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
     st->cl.apply=NULL;
     st->cl.interface=&st->ops;
     st->ops.st=st;
-    st->ops.sethash=rsa_pub_sethash;
     st->common.hashbuf=NULL;
     st->ops.unpick=rsa_sig_unpick;
     st->ops.check=rsa_sig_check;
@@ -364,6 +360,8 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
 
     RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
 
+    rsa_sethash(l,&st->common,&st->ops.hash);
+
     return st;
 
  error_out:
@@ -378,6 +376,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 +403,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 +412,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 +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:
@@ -441,8 +443,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 LDFATAL_FILE(...) ({ load_err(l,0,f,0,__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;		\
@@ -502,7 +504,6 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     st->cl.apply=NULL;
     st->cl.interface=&st->ops;
     st->ops.st=st;
-    st->ops.sethash=rsa_priv_sethash;
     st->common.hashbuf=NULL;
     st->ops.sign=rsa_sign;
     st->ops.hash=0;
@@ -630,6 +631,8 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
 	fatal_perror("rsa-private (%s:%d): ferror",loc.file,loc.line);
     }
 
+    rsa_sethash(l,&st->common,&st->ops.hash);
+
     /*
      * Now verify the validity of the key, and set up the auxiliary
      * values for fast CRT signing.
@@ -710,13 +713,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;
@@ -732,6 +736,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;
 
@@ -745,6 +750,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;
 }
 
@@ -766,6 +772,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 */