chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rsa: sharing load_ctx: Introduce what
[secnet.git]
/
rsa.c
diff --git
a/rsa.c
b/rsa.c
index e4d62ad10f2c4b13ad60a5ad8ed63e1a7821cc5d..3ce72b86fcdbbb3b609cf092943a7eb38f3614c3 100644
(file)
--- a/
rsa.c
+++ b/
rsa.c
@@
-45,15
+45,14
@@
struct rsacommon {
uint8_t *hashbuf;
};
uint8_t *hashbuf;
};
-struct
rsapriv_
load_ctx {
- void (*verror)(struct
rsapriv_
load_ctx *l,
+struct load_ctx {
+ void (*verror)(struct load_ctx *l,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args);
FILE *maybe_f, bool_t unsup,
const char *message, va_list args);
- bool_t (*postreadcheck)(struct rsapriv_load_ctx *l, FILE *f);
+ bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
+ const char *what;
+ struct cloc *loc;
union {
union {
- struct {
- struct cloc loc;
- } apply;
struct {
struct log_if *log;
} tryload;
struct {
struct log_if *log;
} tryload;
@@
-61,20
+60,20
@@
struct rsapriv_load_ctx {
};
FORMAT(printf,4,0)
};
FORMAT(printf,4,0)
-static void verror_tryload(struct
rsapriv_
load_ctx *l,
+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;
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: "
);
+ slilog_part(l->u.tryload.log,class,"
%s: ",l->what
);
vslilog(l->u.tryload.log,class,message,args);
}
vslilog(l->u.tryload.log,class,message,args);
}
-static void verror_cfgfatal(struct
rsapriv_
load_ctx *l,
+static void verror_cfgfatal(struct load_ctx *l,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args)
{
FILE *maybe_f, bool_t unsup,
const char *message, va_list args)
{
- vcfgfatal_maybefile(maybe_f,
l->u.apply.loc,"rsa-private"
,message,args);
+ vcfgfatal_maybefile(maybe_f,
*l->loc,l->what
,message,args);
}
struct rsapriv {
}
struct rsapriv {
@@
-360,7
+359,7
@@
static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
return new_closure(&st->cl);
}
return new_closure(&st->cl);
}
-static void load_error(struct
rsapriv_
load_ctx *l, FILE *maybe_f,
+static void load_error(struct load_ctx *l, FILE *maybe_f,
bool_t unsup, const char *fmt, ...)
{
va_list al;
bool_t unsup, const char *fmt, ...)
{
va_list al;
@@
-380,7
+379,7
@@
static void load_error(struct rsapriv_load_ctx *l, FILE *maybe_f,
keyfile_get_tmp; \
})
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;
{
uint32_t r;
r=fgetc(f)<<24;
@@
-390,7
+389,7
@@
static uint32_t keyfile_get_32(struct rsapriv_load_ctx *l, FILE *f)
return r;
}
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;
{
uint16_t r;
r=fgetc(f)<<8;
@@
-409,7
+408,7
@@
static void rsapriv_dispose(void *sst)
free(st);
}
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)
{
FILE *f, struct cloc loc,
bool_t do_validity_check)
{
@@
-638,7
+637,7
@@
error_out:
goto out;
}
goto out;
}
-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; }
{
assert(!ferror(f));
if (feof(f)) { load_error(l,0,0,"eof mid-integer"); return False; }
@@
-648,7
+647,7
@@
static bool_t postreadcheck_tryload(struct rsapriv_load_ctx *l, FILE *f)
bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
struct buffer_if *privkeydata,
struct sigprivkey_if **sigpriv_r,
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;
{
FILE *f=0;
struct rsapriv *st=0;
@@
-659,13
+658,11
@@
bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
goto error_out;
}
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->verror=verror_tryload;
l->postreadcheck=postreadcheck_tryload;
+ l->loc=&loc;
l->u.tryload.log=log;
st=rsa_loadpriv_core(l,f,loc,False);
l->u.tryload.log=log;
st=rsa_loadpriv_core(l,f,loc,False);
@@
-681,9
+678,9
@@
bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
return True;
}
return True;
}
-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;
}
return True;
}
@@
-694,11
+691,12
@@
static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
item_t *i;
cstring_t filename;
FILE *f;
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->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);
/* Argument is filename pointing to SSH1 private key file */
i=list_elem(args,0);