X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rsa.c;h=f4aad4cb82cafbc25979526749fd224df988e2f9;hb=427f29236dd040dd14a2c75268bf75210756cbeb;hp=14d7050bab2e6ccc683115704d56e4ee594b34de;hpb=55034eda81e963df224d71bce47d364aaafe0868;p=secnet.git diff --git a/rsa.c b/rsa.c index 14d7050..f4aad4c 100644 --- a/rsa.c +++ b/rsa.c @@ -45,11 +45,14 @@ struct rsacommon { uint8_t *hashbuf; }; +#define FREE(b) ({ free((b)); (b)=0; }) + 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); + const char *what; struct cloc *loc; union { struct { @@ -64,7 +67,7 @@ static void verror_tryload(struct load_ctx *l, const char *message, va_list args) { int class=unsup ? M_DEBUG : M_ERR; - slilog_part(l->u.tryload.log,class,"rsa1priv load: "); + slilog_part(l->u.tryload.log,class,"%s: ",l->what); vslilog(l->u.tryload.log,class,message,args); } @@ -72,7 +75,7 @@ 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->loc,"rsa-private",message,args); + vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args); } struct rsapriv { @@ -85,6 +88,17 @@ struct rsapriv { MP_INT q, dq; MP_INT w; }; + +#define RSAPUB_BNS(each) \ + each(0,e,"public exponent") \ + each(1,n,"modulus") + +#define RSAPUB_LOADCORE_PASSBN(ix,en,what) \ + en##s, en##_loc, + +#define RSAPUB_INIT_ST_BN( ix,en,what) mpz_init (&st->en); +#define RSAPUB_CLEAR_ST_BN(ix,en,what) mpz_clear(&st->en); + struct rsapub { closure_t cl; struct sigpubkey_if ops; @@ -301,12 +315,16 @@ static void rsapub_dispose(void *sst) { free(st); } -static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context, - list_t *args) +#define RSAPUB_LOADCORE_DEFBN(ix,en,what) \ + const char *en##s, struct cloc en##_loc, + +#define LDPUBFATAL(enloc,...) \ + cfgfatal(enloc, "rsa-public", __VA_ARGS__) + +static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN) + struct cloc overall_loc) { struct rsapub *st; - item_t *i; - string_t e,n; NEW(st); st->cl.description="rsapub"; @@ -320,41 +338,44 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context, st->ops.check=rsa_sig_check; st->ops.hash=0; st->ops.dispose=rsapub_dispose; - st->loc=loc; - - i=list_elem(args,0); - if (i) { - if (i->type!=t_string) { - cfgfatal(i->loc,"rsa-public","first argument must be a string\n"); - } - e=i->data.string; - if (mpz_init_set_str(&st->e,e,10)!=0) { - cfgfatal(i->loc,"rsa-public","encryption key \"%s\" is not a " - "decimal number string\n",e); - } - } else { - cfgfatal(loc,"rsa-public","you must provide an encryption key\n"); - } - if (mpz_sizeinbase(&st->e, 256) > RSA_MAX_MODBYTES) { - cfgfatal(loc, "rsa-public", "implausibly large public exponent\n"); - } - - i=list_elem(args,1); - if (i) { - if (i->type!=t_string) { - cfgfatal(i->loc,"rsa-public","second argument must be a string\n"); - } - n=i->data.string; - if (mpz_init_set_str(&st->n,n,10)!=0) { - cfgfatal(i->loc,"rsa-public","modulus \"%s\" is not a decimal " - "number string\n",n); - } - } else { - cfgfatal(loc,"rsa-public","you must provide a modulus\n"); - } - if (mpz_sizeinbase(&st->n, 256) > RSA_MAX_MODBYTES) { - cfgfatal(loc, "rsa-public", "implausibly large modulus\n"); + st->loc=overall_loc; + +#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); \ + } \ + if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \ + LDPUBFATAL(en##_loc, "implausibly large " what "\n"); \ } + + RSAPUB_BNS(RSAPUB_LOADCORE_GETBN) + + return st; +} + +static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context, + list_t *args) +{ + +#define RSAPUB_APPLY_GETBN(ix,en,what) \ + item_t *en##i; \ + const char *en##s; \ + en##i=list_elem(args,ix); \ + if (!en##i) \ + cfgfatal(loc,"rsa-public", \ + "you must provide an encryption key\n"); \ + struct cloc en##_loc=en##i->loc; \ + if (en##i->type!=t_string) \ + cfgfatal(en##_loc,"rsa-public", \ + "first argument must be a string\n"); \ + en##s=en##i->data.string; + + RSAPUB_BNS(RSAPUB_APPLY_GETBN) + + struct rsapub *st=rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_PASSBN) + loc); + return new_closure(&st->cl); } @@ -371,7 +392,6 @@ static void load_error(struct load_ctx *l, FILE *maybe_f, #define LDUNSUP(...) ({ load_error(l,0,1,__VA_ARGS__); goto error_out; }) #define LDFATAL_FILE(...) ({ load_error(l,f,0,__VA_ARGS__); goto error_out; }) #define LDUNSUP_FILE(...) ({ load_error(l,f,1,__VA_ARGS__); goto error_out; }) -#define FREE(b) ({ free((b)); (b)=0; }) #define KEYFILE_GET(is) ({ \ uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f); \ if (!l->postreadcheck(l,f)) goto error_out; \ @@ -646,7 +666,7 @@ static bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f) bool_t rsa1_loadpriv(const struct sigscheme_info *algo, struct buffer_if *privkeydata, struct sigprivkey_if **sigpriv_r, - struct log_if *log) + struct log_if *log, struct cloc loc) { FILE *f=0; struct rsapriv *st=0; @@ -657,11 +677,8 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo, goto error_out; } - struct cloc loc; - loc.file="dynamically loaded"; - loc.line=0; - struct load_ctx l[1]; + l->what="rsa1priv load"; l->verror=verror_tryload; l->postreadcheck=postreadcheck_tryload; l->loc=&loc; @@ -695,6 +712,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context, FILE *f; struct load_ctx l[1]; + l->what="rsa-private"; l->verror=verror_cfgfatal; l->postreadcheck=postreadcheck_apply; l->loc=&loc;