X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=rsa.c;h=ef99f91f4967228908885764fca2ef2599ca111c;hb=4bc0381500403be5f3e40bc39f65a2d8fb75cf19;hp=9261ab30c93bdd42558a27a01796233b416a595f;hpb=c34ea2a0348d83fe3b835aec255cbf50e744275b;p=secnet.git

diff --git a/rsa.c b/rsa.c
index 9261ab3..ef99f91 100644
--- a/rsa.c
+++ b/rsa.c
@@ -48,12 +48,12 @@ struct rsacommon {
 #define FREE(b)                ({ free((b)); (b)=0; })
 
 struct load_ctx {
-    void (*verror)(struct load_ctx *l,
-		   FILE *maybe_f, bool_t unsup,
+    void (*verror)(struct load_ctx *l, struct cloc loc,
+		   FILE *maybe_f,
 		   const char *message, va_list args);
     bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
     const char *what;
-    struct cloc *loc;
+    struct cloc loc;
     union {
 	struct {
 	    struct log_if *log;
@@ -61,21 +61,31 @@ struct load_ctx {
     } u;
 };
 
+static void load_err(struct load_ctx *l,
+		     const struct cloc *maybe_loc, FILE *maybe_f,
+		     const char *fmt, ...)
+{
+    va_list al;
+    va_start(al,fmt);
+    l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,fmt,al);
+    va_end(al);
+}
+
 FORMAT(printf,4,0)
-static void verror_tryload(struct load_ctx *l,
-			   FILE *maybe_f, bool_t unsup,
+static void verror_tryload(struct load_ctx *l, struct cloc loc,
+			   FILE *maybe_f,
 			   const char *message, va_list args)
 {
-    int class=unsup ? M_DEBUG : M_ERR;
+    int class=M_ERR;
     slilog_part(l->u.tryload.log,class,"%s: ",l->what);
     vslilog(l->u.tryload.log,class,message,args);
 }
 
-static void verror_cfgfatal(struct load_ctx *l,
-			    FILE *maybe_f, bool_t unsup,
+static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
+			    FILE *maybe_f,
 			    const char *message, va_list args)
 {
-    vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args);
+    vcfgfatal_maybefile(maybe_f,l->loc,l->what,message,args,"");
 }
 
 struct rsapriv {
@@ -96,6 +106,9 @@ struct rsapriv {
 #define RSAPUB_LOADCORE_PASSBN(ix,en,what) \
     en##s, en##_loc,
 
+#define RSAPUB_INIT_ST_BN( ix,en,what) mpz_init (&st->en);
+#define RSAPUB_CLEAR_ST_BN(ix,en,what) mpz_clear(&st->en);
+
 struct rsapub {
     closure_t cl;
     struct sigpubkey_if ops;
@@ -306,8 +319,8 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
 static void rsapub_dispose(void *sst) {
     struct rsapub *st=sst;
 
-    mpz_clear(&st->e);
-    mpz_clear(&st->n);
+    if (!st) return;
+    RSAPUB_BNS(RSAPUB_CLEAR_ST_BN)
     rsacommon_dispose(&st->common);
     free(st);
 }
@@ -315,8 +328,13 @@ 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,__VA_ARGS__);	\
+	goto error_out;				\
+    })
+
 static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
-				       struct cloc overall_loc)
+				       struct load_ctx *l)
 {
     struct rsapub *st;
 
@@ -332,25 +350,35 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN)
     st->ops.check=rsa_sig_check;
     st->ops.hash=0;
     st->ops.dispose=rsapub_dispose;
-    st->loc=overall_loc;
+    st->loc=l->loc;
+    RSAPUB_BNS(RSAPUB_INIT_ST_BN)
 
 #define RSAPUB_LOADCORE_GETBN(ix,en,what)				\
     if (mpz_init_set_str(&st->en,en##s,10)!=0) {			\
-	cfgfatal(en##_loc,"rsa-public", what " \"%s\" is not a "	\
-		 "decimal number string\n",en##s);			\
+	LDPUBFATAL(&en##_loc, what " \"%s\" is not a "			\
+		 "decimal number string",en##s);			\
     }									\
     if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) {		\
-	cfgfatal(en##_loc, "rsa-public", "implausibly large " what "\n"); \
+	LDPUBFATAL(&en##_loc, "implausibly large " what);		\
     }
 
     RSAPUB_BNS(RSAPUB_LOADCORE_GETBN)
 
     return st;
+
+ error_out:
+    rsapub_dispose(st);
+    return 0;
 }
 
 static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
 			    list_t *args)
 {
+    struct load_ctx l[1];
+    l->verror=verror_cfgfatal;
+    l->postreadcheck=0;
+    l->what="rsa-public";
+    l->loc=loc;
 
 #define RSAPUB_APPLY_GETBN(ix,en,what)				\
     item_t *en##i;						\
@@ -368,24 +396,55 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     RSAPUB_BNS(RSAPUB_APPLY_GETBN)
 
     struct rsapub *st=rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_PASSBN)
-				       loc);
+				       l);
 
     return new_closure(&st->cl);
 }
 
-static void load_error(struct load_ctx *l, FILE *maybe_f,
-		       bool_t unsup, const char *fmt, ...)
+bool_t rsa1_loadpub(const struct sigscheme_info *algo,
+		    struct buffer_if *pubkeydata,
+		    struct sigpubkey_if **sigpub_r,
+		    closure_t **closure_r,
+		    struct log_if *log, struct cloc loc)
 {
-    va_list al;
-    va_start(al,fmt);
-    l->verror(l,maybe_f,unsup,fmt,al);
-    va_end(al);
+    struct rsapub *st=0;
+
+    struct load_ctx l[1];
+    l->verror=verror_tryload;
+    l->postreadcheck=0;
+    l->what="rsa1_loadpub";
+    l->loc=loc;
+    l->u.tryload.log=log;
+
+    char *nul=buf_append(pubkeydata,1);
+    if (!nul) LDPUBFATAL(0,"rsa1 public key data too long for extra nul");
+    *nul=0;
+
+    const char *delim=" \t\n";
+    char *saveptr;
+    /*unused*/ strtok_r(pubkeydata->start,delim,&saveptr);
+
+#define RSAPUB_TRYLOAD_GETBN(ix,en,what)				\
+    struct cloc en##_loc=loc;						\
+    const char *en##s=strtok_r(0,delim,&saveptr);			\
+    if (!en##s) LDPUBFATAL(0,"end of pubkey data looking for " what);
+
+    RSAPUB_BNS(RSAPUB_TRYLOAD_GETBN);
+
+    st=rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_PASSBN) l);
+    if (!st) goto error_out;
+
+    *sigpub_r=&st->ops;
+    *closure_r=&st->cl;
+    return True;
+
+ error_out:
+    rsapub_dispose(st);
+    return False;
 }
 
-#define LDFATAL(...)      ({ load_error(l,0,0,__VA_ARGS__); goto error_out; })
-#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 LDFATAL(...)      ({ load_err(l,0,0,__VA_ARGS__); goto error_out; })
+#define LDFATAL_FILE(...) ({ load_err(l,0,f,__VA_ARGS__); goto error_out; })
 #define KEYFILE_GET(is)   ({					\
 	uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f);	\
 	if (!l->postreadcheck(l,f)) goto error_out;		\
@@ -467,7 +526,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     length=strlen(AUTHFILE_ID_STRING)+1;
     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"
+	LDFATAL_FILE("failed to read magic ID"
 		     " string from SSH1 private keyfile\n");
     }
     FREE(b);
@@ -475,7 +534,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     cipher_type=fgetc(f);
     KEYFILE_GET(32); /* "Reserved data" */
     if (cipher_type != 0) {
-	LDUNSUP("we don't support encrypted keyfiles\n");
+	LDFATAL("we don't support encrypted keyfiles\n");
     }
 
     /* Read the public key */
@@ -653,7 +712,7 @@ error_out:
 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; }
+    if (feof(f)) { load_err(l,0,0,"eof mid-integer"); return False; }
     return True;
 }
 
@@ -675,7 +734,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     l->what="rsa1priv load";
     l->verror=verror_tryload;
     l->postreadcheck=postreadcheck_tryload;
-    l->loc=&loc;
+    l->loc=loc;
     l->u.tryload.log=log;
 
     st=rsa_loadpriv_core(l,f,loc,False);
@@ -683,7 +742,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
     goto out;
 
  error_out:
-    if (st) { free(st); st=0; }
+    FREE(st);
  out:
     if (f) fclose(f);
     if (!st) return False;
@@ -693,7 +752,7 @@ bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
 
 static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
 {
-    cfgfile_postreadcheck(*l->loc,f);
+    cfgfile_postreadcheck(l->loc,f);
     return True;
 }
 
@@ -709,7 +768,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     l->what="rsa-private";
     l->verror=verror_cfgfatal;
     l->postreadcheck=postreadcheck_apply;
-    l->loc=&loc;
+    l->loc=loc;
 
     /* Argument is filename pointing to SSH1 private key file */
     i=list_elem(args,0);