X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=rsa.c;fp=rsa.c;h=3770aa6571608c01086d71041c6bdf93bb46534e;hb=62f82d6852a7c1f058befc26890e5ed3e6393a4a;hp=7d5024922c4829e9dd94361fd4d6b0ec81a53ad5;hpb=7864d26ccee97be6376b25d4f6a6b6b86f274f54;p=secnet.git

diff --git a/rsa.c b/rsa.c
index 7d50249..3770aa6 100644
--- 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 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)
@@ -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) {			\
-	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) {		\
-	LDPUBFATAL(en##_loc, "implausibly large " what "\n");		\
+	LDPUBFATAL(&en##_loc, "implausibly large " what "\n");		\
     }
 
     RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)