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;
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=unsup ? M_DEBUG : M_ERR;
+ int class=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, 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 {
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; \
})
#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); \
+ "decimal number string",en##s); \
} \
if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \
- LDPUBFATAL(&en##_loc, "implausibly large " what "\n"); \
+ LDPUBFATAL(&en##_loc, "implausibly large " what); \
}
RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
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;
if (!st) goto error_out;
*sigpub_r=&st->ops;
+ *closure_r=&st->cl;
return True;
error_out:
return False;
}
-#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 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; \
length=strlen(AUTHFILE_ID_STRING)+1;
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"
+ LDFATAL_FILE("failed to read magic ID"
" string from SSH1 private keyfile\n");
}
FREE(b);
cipher_type=fgetc(f);
KEYFILE_GET(32); /* "Reserved data" */
if (cipher_type != 0) {
- LDUNSUP("we don't support encrypted keyfiles\n");
+ LDFATAL("we don't support encrypted keyfiles\n");
}
/* Read the public key */
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;
if (f) fclose(f);
if (!st) return False;
*sigpriv_r=&st->ops;
+ *closure_r=&st->cl;
return True;
}