X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rsa.c;h=3ce72b86fcdbbb3b609cf092943a7eb38f3614c3;hb=0fe7c7833057bdc63a40c27ac64e3bbda43658b7;hp=03e3ab835f087ca33a7912546760c83353659262;hpb=c7e6b78d0e867626783850dddc2d61c1c8999801;p=secnet.git diff --git a/rsa.c b/rsa.c index 03e3ab8..3ce72b8 100644 --- a/rsa.c +++ b/rsa.c @@ -45,6 +45,37 @@ struct rsacommon { uint8_t *hashbuf; }; +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 { + struct log_if *log; + } tryload; + } u; +}; + +FORMAT(printf,4,0) +static void verror_tryload(struct 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,"%s: ",l->what); + vslilog(l->u.tryload.log,class,message,args); +} + +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,l->what,message,args); +} + struct rsapriv { closure_t cl; struct sigprivkey_if ops; @@ -328,53 +359,44 @@ 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); - union { - struct { - struct cloc loc; - } apply; - } u; -}; +static void load_error(struct 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; }) #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) (keyfile_get_##is(loc,f)) +#define KEYFILE_GET(is) ({ \ + uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f); \ + if (!l->postreadcheck(l,f)) goto error_out; \ + keyfile_get_tmp; \ + }) -static uint32_t keyfile_get_32(struct cloc loc, FILE *f) +static uint32_t keyfile_get_32(struct load_ctx *l, FILE *f) { uint32_t r; r=fgetc(f)<<24; r|=fgetc(f)<<16; r|=fgetc(f)<<8; r|=fgetc(f); - cfgfile_postreadcheck(loc,f); return r; } -static uint16_t keyfile_get_16(struct cloc loc, FILE *f) +static uint16_t keyfile_get_16(struct load_ctx *l, FILE *f) { uint16_t r; r=fgetc(f)<<8; r|=fgetc(f); - cfgfile_postreadcheck(loc,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; @@ -386,10 +408,9 @@ static void rsapriv_dispose(void *sst) free(st); } -static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l, +static struct rsapriv *rsa_loadpriv_core(struct 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; @@ -434,8 +455,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); @@ -593,8 +613,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: @@ -617,11 +637,51 @@ 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 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, struct cloc loc) { - vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args); + 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 load_ctx l[1]; + l->what="rsa1priv load"; + l->verror=verror_tryload; + l->postreadcheck=postreadcheck_tryload; + l->loc=&loc; + 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 load_ctx *l, FILE *f) +{ + cfgfile_postreadcheck(*l->loc,f); + return True; } static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context, @@ -631,10 +691,12 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context, item_t *i; cstring_t filename; FILE *f; - struct rsapriv_load_ctx l[1]; + struct load_ctx l[1]; + l->what="rsa-private"; l->verror=verror_cfgfatal; - l->u.apply.loc=loc; + l->postreadcheck=postreadcheck_apply; + l->loc=&loc; /* Argument is filename pointing to SSH1 private key file */ i=list_elem(args,0); @@ -668,7 +730,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); }