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;
+ dict_t *deprdict; /* used only to look up hash */
struct cloc loc;
union {
struct {
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 {
static const char *hexchars="0123456789abcdef";
-static void rsa_sethash(struct rsacommon *c, struct hash_if *hash,
+static void rsa_sethash(struct load_ctx *l,
+ struct rsacommon *c,
const struct hash_if **in_ops)
{
- free(c->hashbuf);
+ struct hash_if *hash=0;
+ if (l->deprdict)
+ hash=find_cl_if(l->deprdict,"hash",CL_HASH,False,"site",l->loc);
+ if (!hash)
+ hash=sha1_hash_if;
c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
*in_ops=hash;
}
-static void rsa_pub_sethash(void *sst, struct hash_if *hash)
-{
- struct rsapub *st=sst;
- rsa_sethash(&st->common, hash, &st->ops.hash);
-}
-static void rsa_priv_sethash(void *sst, struct hash_if *hash)
-{
- struct rsapriv *st=sst;
- rsa_sethash(&st->common, hash, &st->ops.hash);
-}
+
static void rsacommon_dispose(struct rsacommon *c)
{
free(c->hashbuf);
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; \
})
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.sethash=rsa_pub_sethash;
st->common.hashbuf=NULL;
st->ops.unpick=rsa_sig_unpick;
st->ops.check=rsa_sig_check;
RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
+ rsa_sethash(l,&st->common,&st->ops.hash);
+
return st;
error_out:
l->verror=verror_cfgfatal;
l->postreadcheck=0;
l->what="rsa-public";
+ l->deprdict=context;
l->loc=loc;
#define RSAPUB_APPLY_GETBN(ix,en,what) \
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;
l->verror=verror_tryload;
l->postreadcheck=0;
l->what="rsa1_loadpub";
+ l->deprdict=0;
l->loc=loc;
l->u.tryload.log=log;
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; \
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.sethash=rsa_priv_sethash;
st->common.hashbuf=NULL;
st->ops.sign=rsa_sign;
st->ops.hash=0;
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 */
fatal_perror("rsa-private (%s:%d): ferror",loc.file,loc.line);
}
+ rsa_sethash(l,&st->common,&st->ops.hash);
+
/*
* Now verify the validity of the key, and set up the auxiliary
* values for fast CRT signing.
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;
l->what="rsa1priv load";
l->verror=verror_tryload;
l->postreadcheck=postreadcheck_tryload;
+ l->deprdict=0;
l->loc=loc;
l->u.tryload.log=log;
if (f) fclose(f);
if (!st) return False;
*sigpriv_r=&st->ops;
+ *closure_r=&st->cl;
return True;
}
l->what="rsa-private";
l->verror=verror_cfgfatal;
l->postreadcheck=postreadcheck_apply;
+ l->deprdict=context;
l->loc=loc;
/* Argument is filename pointing to SSH1 private key file */
Message(M_WARNING,"rsa-private (%s:%d): cannot open keyfile "
"\"%s\"; assuming it's valid while we check the "
"rest of the configuration\n",loc.file,loc.line,filename);
+ return NULL;
} else {
fatal_perror("rsa-private (%s:%d): cannot open file \"%s\"",
loc.file,loc.line,filename);