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 {
+ 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;
MP_INT q, dq;
MP_INT w;
};
+
+#define RSAPUB_BNS(each) \
+ each(0,e,"public exponent") \
+ each(1,n,"modulus")
+
struct rsapub {
closure_t cl;
struct sigpubkey_if ops;
{
struct rsapub *st;
item_t *i;
- string_t e,n;
NEW(st);
st->cl.description="rsapub";
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");
+#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"); \
+ } \
+ if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \
+ cfgfatal(loc, "rsa-public", "implausibly large " what "\n"); \
}
+
+ RSAPUB_BNS(RSAPUB_APPLY_GETBN)
+
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);
- bool_t (*postreadcheck)(struct rsapriv_load_ctx *l, FILE *f);
- union {
- struct {
- struct cloc loc;
- } apply;
- struct {
- struct log_if *log;
- } tryload;
- } 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) ({ \
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 rsapriv_load_ctx *l, FILE *f)
+static uint32_t keyfile_get_32(struct load_ctx *l, FILE *f)
{
uint32_t r;
r=fgetc(f)<<24;
return r;
}
-static uint16_t keyfile_get_16(struct rsapriv_load_ctx *l, FILE *f)
+static uint16_t keyfile_get_16(struct load_ctx *l, FILE *f)
{
uint16_t r;
r=fgetc(f)<<8;
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;
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)
{
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)
+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; }
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;
goto error_out;
}
- struct cloc loc;
- loc.file="dynamically loaded";
- loc.line=0;
-
- struct rsapriv_load_ctx l[1];
+ 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);
return True;
}
-static void verror_cfgfatal(struct rsapriv_load_ctx *l,
- FILE *maybe_f, bool_t unsup,
- const char *message, va_list args)
-{
- vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args);
-}
-
-static bool_t postreadcheck_apply(struct rsapriv_load_ctx *l, FILE *f)
+static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
{
- cfgfile_postreadcheck(l->u.apply.loc,f);
+ cfgfile_postreadcheck(*l->loc,f);
return True;
}
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->postreadcheck=postreadcheck_apply;
- l->u.apply.loc=loc;
+ l->loc=&loc;
/* Argument is filename pointing to SSH1 private key file */
i=list_elem(args,0);
~ian / secnet.git / blobdiff