chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rsa: LDPUBFATAL: Move & before lc into callers
[secnet.git]
/
rsa.c
diff --git
a/rsa.c
b/rsa.c
index 7d5024922c4829e9dd94361fd4d6b0ec81a53ad5..3770aa6571608c01086d71041c6bdf93bb46534e 100644
(file)
--- a/
rsa.c
+++ b/
rsa.c
@@
-328,7
+328,10
@@
static void rsapub_dispose(void *sst) {
#define RSAPUB_LOADCORE_DEFBN(ix,en,what) \
const char *en##s, struct cloc en##_loc,
#define RSAPUB_LOADCORE_DEFBN(ix,en,what) \
const char *en##s, struct cloc en##_loc,
-#define LDPUBFATAL(lc,...) ({load_err(l,&lc,0,0,__VA_ARGS__); goto error_out;})
+#define LDPUBFATAL(lc,...) ({ \
+ load_err(l,(lc),0,0,__VA_ARGS__); \
+ goto error_out; \
+ })
static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
struct load_ctx *l)
static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
struct load_ctx *l)
@@
-352,11
+355,11
@@
static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
#define RSAPUB_LOADCORE_GETBN(ix,en,what) \
if (mpz_init_set_str(&st->en,en##s,10)!=0) { \
#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 "
\
+ LDPUBFATAL(
&en##_loc, what " \"%s\" is not a "
\
"decimal number string\n",en##s); \
} \
if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \
"decimal number string\n",en##s); \
} \
if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \
- LDPUBFATAL(
en##_loc, "implausibly large " what "\n");
\
+ LDPUBFATAL(
&en##_loc, "implausibly large " what "\n");
\
}
RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
}
RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)