The scheme loading interface doesn't provide the filename (and it will
handle logging it if need be). For the rsapriv_apply closure, the
config location will allow one to find the filename which seems
sufficient to me.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
FILE *f, struct cloc loc,
static struct rsapriv *rsa_loadpriv_core(struct rsapriv_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;
{
struct rsapriv *st=0;
long length;
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"
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");
done_checks:
if (!valid) {
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");
do_validity_check=False;
}
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);
}
fclose(f);
return new_closure(&st->cl);
}