#define FREE(b) ({ free((b)); (b)=0; })
struct load_ctx {
- void (*verror)(struct load_ctx *l,
+ void (*verror)(struct load_ctx *l, struct cloc loc,
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;
+ struct cloc loc;
union {
struct {
struct log_if *log;
} u;
};
-FORMAT(printf,4,0)
-static void verror_tryload(struct load_ctx *l,
+static void load_err(struct load_ctx *l,
+ const struct cloc *maybe_loc, FILE *maybe_f,
+ bool_t unsup, const char *fmt, ...)
+{
+ va_list al;
+ va_start(al,fmt);
+ l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,unsup,fmt,al);
+ va_end(al);
+}
+
+FORMAT(printf,5,0)
+static void verror_tryload(struct load_ctx *l, struct cloc loc,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args)
{
vslilog(l->u.tryload.log,class,message,args);
}
-static void verror_cfgfatal(struct load_ctx *l,
+static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
FILE *maybe_f, bool_t unsup,
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 {
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;
static void rsapub_dispose(void *sst) {
struct rsapub *st=sst;
+ if (!st) return;
mpz_clear(&st->e);
mpz_clear(&st->n);
rsacommon_dispose(&st->common);
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;
NEW(st);
st->cl.description="rsapub";
st->ops.check=rsa_sig_check;
st->ops.hash=0;
st->ops.dispose=rsapub_dispose;
- st->loc=loc;
+ st->loc=overall_loc;
+ RSAPUB_BNS(RSAPUB_INIT_ST_BN)
-#define RSAPUB_APPLY_GETBN(ix,en,what) \
- char *en; \
- i=list_elem(args,ix); \
- if (i) { \
- if (i->type!=t_string) { \
- cfgfatal(i->loc,"rsa-public",what " must be a string\n"); \
- } \
- en=i->data.string; \
- if (mpz_init_set_str(&st->en,en,10)!=0) { \
- cfgfatal(i->loc,"rsa-public", what " \"%s\" is not a " \
- "decimal number string\n",en); \
- } \
- } else { \
- cfgfatal(loc,"rsa-public","you must provide the " what "\n"); \
+#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) { \
- cfgfatal(loc, "rsa-public", "implausibly large " what "\n"); \
+ LDPUBFATAL(en##_loc, "implausibly large " what "\n"); \
}
- RSAPUB_BNS(RSAPUB_APPLY_GETBN)
+ RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
- return new_closure(&st->cl);
+ return st;
+
+ error_out:
+ rsapub_dispose(st);
+ return 0;
}
-static void load_error(struct load_ctx *l, FILE *maybe_f,
- bool_t unsup, const char *fmt, ...)
+static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
+ list_t *args)
{
- va_list al;
- va_start(al,fmt);
- l->verror(l,maybe_f,unsup,fmt,al);
- va_end(al);
+
+#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);
}
-#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 LDFATAL(...) ({ load_err(l,0,0,0,__VA_ARGS__); goto error_out; })
+#define LDUNSUP(...) ({ load_err(l,0,0,1,__VA_ARGS__); goto error_out; })
+#define LDFATAL_FILE(...) ({ load_err(l,0,f,0,__VA_ARGS__); goto error_out; })
+#define LDUNSUP_FILE(...) ({ load_err(l,0,f,1,__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; \
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; }
+ if (feof(f)) { load_err(l,0,0,0,"eof mid-integer"); return False; }
return True;
}
l->what="rsa1priv load";
l->verror=verror_tryload;
l->postreadcheck=postreadcheck_tryload;
- l->loc=&loc;
+ l->loc=loc;
l->u.tryload.log=log;
st=rsa_loadpriv_core(l,f,loc,False);
static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
{
- cfgfile_postreadcheck(*l->loc,f);
+ cfgfile_postreadcheck(l->loc,f);
return True;
}
l->what="rsa-private";
l->verror=verror_cfgfatal;
l->postreadcheck=postreadcheck_apply;
- l->loc=&loc;
+ l->loc=loc;
/* Argument is filename pointing to SSH1 private key file */
i=list_elem(args,0);
~ianmdlvl / secnet.git / blobdiff