rsa: Introduce RSAPUB_BNS and RSAPUB_APPLY_GETBN

[secnet.git] / rsa.c

diff --git a/rsa.c b/rsa.c
index 18b4f3f2e55b592da2bbb28eb191c39c55617103..9443115493a18aff2f2dc2812ae3a554741c6243 100644 (file)
--- a/rsa.c
+++ b/rsa.c
@@ -45,11 +45,14 @@ struct rsacommon {
     uint8_t *hashbuf;
 };
 
+#define FREE(b)                ({ free((b)); (b)=0; })
+
 struct load_ctx {
     void (*verror)(struct load_ctx *l,
                   FILE *maybe_f, bool_t unsup,
                   const char *message, va_list args);
     bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
+    const char *what;
     struct cloc *loc;
     union {
        struct {
@@ -64,7 +67,7 @@ static void verror_tryload(struct load_ctx *l,
                           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);
 }
 
@@ -72,7 +75,7 @@ static void verror_cfgfatal(struct load_ctx *l,
                            FILE *maybe_f, bool_t unsup,
                            const char *message, va_list args)
 {
-    vcfgfatal_maybefile(maybe_f,*l->loc,"rsa-private",message,args);
+    vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args);
 }
 
 struct rsapriv {
@@ -85,6 +88,11 @@ struct rsapriv {
     MP_INT q, dq;
     MP_INT w;
 };
+
+#define RSAPUB_BNS(each)                       \
+    each(0,e,"public exponent")                        \
+    each(1,n,"modulus")
+
 struct rsapub {
     closure_t cl;
     struct sigpubkey_if ops;
@@ -306,7 +314,6 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
 {
     struct rsapub *st;
     item_t *i;
-    string_t e,n;
 
     NEW(st);
     st->cl.description="rsapub";
@@ -322,39 +329,27 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->ops.dispose=rsapub_dispose;
     st->loc=loc;
 
-    i=list_elem(args,0);
-    if (i) {
-       if (i->type!=t_string) {
-           cfgfatal(i->loc,"rsa-public","first argument must be a string\n");
-       }
-       e=i->data.string;
-       if (mpz_init_set_str(&st->e,e,10)!=0) {
-           cfgfatal(i->loc,"rsa-public","encryption key \"%s\" is not a "
-                    "decimal number string\n",e);
-       }
-    } else {
-       cfgfatal(loc,"rsa-public","you must provide an encryption key\n");
-    }
-    if (mpz_sizeinbase(&st->e, 256) > RSA_MAX_MODBYTES) {
-       cfgfatal(loc, "rsa-public", "implausibly large public exponent\n");
-    }
-    
-    i=list_elem(args,1);
-    if (i) {
-       if (i->type!=t_string) {
-           cfgfatal(i->loc,"rsa-public","second argument must be a string\n");
-       }
-       n=i->data.string;
-       if (mpz_init_set_str(&st->n,n,10)!=0) {
-           cfgfatal(i->loc,"rsa-public","modulus \"%s\" is not a decimal "
-                    "number string\n",n);
-       }
-    } else {
-       cfgfatal(loc,"rsa-public","you must provide a modulus\n");
-    }
-    if (mpz_sizeinbase(&st->n, 256) > RSA_MAX_MODBYTES) {
-       cfgfatal(loc, "rsa-public", "implausibly large modulus\n");
+#define RSAPUB_APPLY_GETBN(ix,en,what)                                 \
+    char *en;                                                          \
+    i=list_elem(args,ix);                                              \
+    if (i) {                                                           \
+       if (i->type!=t_string) {                                        \
+           cfgfatal(i->loc,"rsa-public",what " must be a string\n");   \
+       }                                                               \
+       en=i->data.string;                                              \
+       if (mpz_init_set_str(&st->en,en,10)!=0) {                       \
+           cfgfatal(i->loc,"rsa-public", what " \"%s\" is not a "      \
+                    "decimal number string\n",en);                     \
+       }                                                               \
+    } else {                                                           \
+       cfgfatal(loc,"rsa-public","you must provide the " what "\n");   \
+    }                                                                  \
+    if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) {             \
+       cfgfatal(loc, "rsa-public", "implausibly large " what "\n");    \
     }
+
+    RSAPUB_BNS(RSAPUB_APPLY_GETBN)
+
     return new_closure(&st->cl);
 }
 
@@ -371,7 +366,6 @@ static void load_error(struct load_ctx *l, FILE *maybe_f,
 #define LDUNSUP(...)      ({ load_error(l,0,1,__VA_ARGS__); goto error_out; })
 #define LDFATAL_FILE(...) ({ load_error(l,f,0,__VA_ARGS__); goto error_out; })
 #define LDUNSUP_FILE(...) ({ load_error(l,f,1,__VA_ARGS__); goto error_out; })
-#define FREE(b)                ({ free((b)); (b)=0; })
 #define KEYFILE_GET(is)   ({                                   \
        uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f);     \
        if (!l->postreadcheck(l,f)) goto error_out;             \
@@ -658,6 +652,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     }
 
     struct load_ctx l[1];
+    l->what="rsa1priv load";
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
     l->loc=&loc;
@@ -691,6 +686,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     FILE *f;
     struct load_ctx l[1];
 
+    l->what="rsa-private";
     l->verror=verror_cfgfatal;
     l->postreadcheck=postreadcheck_apply;
     l->loc=&loc;