X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rsa.c;h=d5d80ff6664dbcb0e0a1d0a07960c67fb3bcbf92;hb=934cb196c3928724c351045f25c740a830941e4a;hp=1c37ef98acf3abec9e641267d532e720efa74f27;hpb=627bf9eb662972a9b2d923bfdeb6cc01ac249095;p=secnet.git

diff --git a/rsa.c b/rsa.c
index 1c37ef9..d5d80ff 100644
--- a/rsa.c
+++ b/rsa.c
@@ -90,6 +90,10 @@ static void rsa_priv_sethash(void *sst, struct hash_if *hash)
     struct rsapriv *st=sst;
     rsa_sethash(&st->common, hash, &st->ops.hash);
 }
+static void rsacommon_dispose(struct rsacommon *c)
+{
+    free(c->hashbuf);
+}
 
 static void emsa_pkcs1(MP_INT *n, MP_INT *m,
 		       const uint8_t *data, int32_t datalen)
@@ -258,6 +262,15 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
     return ok;
 }
 
+static void rsapub_dispose(void *sst) {
+    struct rsapub *st=sst;
+
+    mpz_clear(&st->e);
+    mpz_clear(&st->n);
+    rsacommon_dispose(&st->common);
+    free(st);
+}
+
 static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
 			    list_t *args)
 {
@@ -276,7 +289,7 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->ops.unpick=rsa_sig_unpick;
     st->ops.check=rsa_sig_check;
     st->ops.hash=0;
-    st->ops.dispose=0; /* xxx */
+    st->ops.dispose=rsapub_dispose;
     st->loc=loc;
 
     i=list_elem(args,0);
@@ -315,39 +328,85 @@ static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-static uint32_t keyfile_get_int(struct cloc loc, FILE *f)
+struct rsapriv_load_ctx {
+    void (*verror)(struct rsapriv_load_ctx *l,
+		   FILE *maybe_f, bool_t unsup,
+		   const char *message, va_list args);
+    bool_t (*postreadcheck)(struct rsapriv_load_ctx *l, FILE *f);
+    union {
+	struct {
+	    struct cloc loc;
+	} apply;
+    } u;
+};
+
+#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 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;		\
+	keyfile_get_tmp;					\
+    })
+
+static uint32_t keyfile_get_32(struct rsapriv_load_ctx *l, FILE *f)
 {
     uint32_t r;
     r=fgetc(f)<<24;
     r|=fgetc(f)<<16;
     r|=fgetc(f)<<8;
     r|=fgetc(f);
-    cfgfile_postreadcheck(loc,f);
     return r;
 }
 
-static uint16_t keyfile_get_short(struct cloc loc, FILE *f)
+static uint16_t keyfile_get_16(struct rsapriv_load_ctx *l, FILE *f)
 {
     uint16_t r;
     r=fgetc(f)<<8;
     r|=fgetc(f);
-    cfgfile_postreadcheck(loc,f);
     return r;
 }
 
-static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
-			     list_t *args)
+static void load_error(struct rsapriv_load_ctx *l, FILE *maybe_f,
+		       bool_t unsup, const char *fmt, ...)
 {
-    struct rsapriv *st;
-    FILE *f;
-    cstring_t filename;
-    item_t *i;
+    va_list al;
+    va_start(al,fmt);
+    l->verror(l,maybe_f,unsup,fmt,al);
+    va_end(al);
+}
+
+static void rsapriv_dispose(void *sst)
+{
+    struct rsapriv *st=sst;
+    mpz_clear(&st->n);
+    mpz_clear(&st->p); mpz_clear(&st->dp);
+    mpz_clear(&st->q); mpz_clear(&st->dq);
+    mpz_clear(&st->w);
+    rsacommon_dispose(&st->common);
+    free(st);
+}
+
+static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
+					 FILE *f, struct cloc loc,
+					 bool_t do_validity_check)
+{
+    struct rsapriv *st=0;
     long length;
-    uint8_t *b, *c;
+    uint8_t *b=0, *c=0;
     int cipher_type;
     MP_INT e,d,iqmp,tmp,tmp2,tmp3;
     bool_t valid;
 
+    mpz_init(&e);
+    mpz_init(&d);
+    mpz_init(&iqmp);
+    mpz_init(&tmp);
+    mpz_init(&tmp2);
+    mpz_init(&tmp3);
+
     NEW(st);
     st->cl.description="rsapriv";
     st->cl.type=CL_SIGPRIVKEY;
@@ -358,153 +417,128 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->common.hashbuf=NULL;
     st->ops.sign=rsa_sign;
     st->ops.hash=0;
-    st->ops.dispose=0; /* xxx */
+    st->ops.dispose=rsapriv_dispose;
     st->loc=loc;
+    mpz_init(&st->n);
+    mpz_init(&st->q);
+    mpz_init(&st->p);
+    mpz_init(&st->dp);
+    mpz_init(&st->dq);
+    mpz_init(&st->w);
 
-    /* Argument is filename pointing to SSH1 private key file */
-    i=list_elem(args,0);
-    if (i) {
-	if (i->type!=t_string) {
-	    cfgfatal(i->loc,"rsa-private","first argument must be a string\n");
-	}
-	filename=i->data.string;
-    } else {
-	filename=NULL; /* Make compiler happy */
-	cfgfatal(loc,"rsa-private","you must provide a filename\n");
-    }
-
-    f=fopen(filename,"rb");
     if (!f) {
-	if (just_check_config) {
-	    Message(M_WARNING,"rsa-private (%s:%d): cannot open keyfile "
-		    "\"%s\"; assuming it's valid while we check the "
-		    "rest of the configuration\n",loc.file,loc.line,filename);
-	    goto assume_valid;
-	} else {
-	    fatal_perror("rsa-private (%s:%d): cannot open file \"%s\"",
-			 loc.file,loc.line,filename);
-	}
+	assert(just_check_config);
+	goto assume_valid;
     }
 
     /* Check that the ID string is correct */
     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) {
-	cfgfatal_maybefile(f,loc,"rsa-private","failed to read magic ID"
-			   " string from SSH1 private keyfile \"%s\"\n",
-			   filename);
+	LDUNSUP_FILE("failed to read magic ID"
+		     " string from SSH1 private keyfile\n");
     }
-    free(b);
+    FREE(b);
 
     cipher_type=fgetc(f);
-    keyfile_get_int(loc,f); /* "Reserved data" */
+    KEYFILE_GET(32); /* "Reserved data" */
     if (cipher_type != 0) {
-	cfgfatal(loc,"rsa-private","we don't support encrypted keyfiles\n");
+	LDUNSUP("we don't support encrypted keyfiles\n");
     }
 
     /* Read the public key */
-    keyfile_get_int(loc,f); /* Not sure what this is */
-    length=(keyfile_get_short(loc,f)+7)/8;
+    KEYFILE_GET(32); /* Not sure what this is */
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausible length %ld for modulus\n",
+	LDFATAL("implausible length %ld for modulus\n",
 		 length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f) != 1) {
-	cfgfatal_maybefile(f,loc,"rsa-private","error reading modulus\n");
+	LDFATAL_FILE("error reading modulus\n");
     }
-    mpz_init(&st->n);
     read_mpbin(&st->n,b,length);
-    free(b);
-    length=(keyfile_get_short(loc,f)+7)/8;
+    FREE(b);
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausible length %ld for e\n",length);
+	LDFATAL("implausible length %ld for e\n",length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private","error reading e\n");
+	LDFATAL_FILE("error reading e\n");
     }
-    mpz_init(&e);
     read_mpbin(&e,b,length);
-    free(b);
+    FREE(b);
     
-    length=keyfile_get_int(loc,f);
+    length=KEYFILE_GET(32);
     if (length>1024) {
-	cfgfatal(loc,"rsa-private","implausibly long (%ld) key comment\n",
+	LDFATAL("implausibly long (%ld) key comment\n",
 		 length);
     }
     c=safe_malloc(length+1,"rsapriv_apply");
     if (fread(c,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private","error reading key comment\n");
+	LDFATAL_FILE("error reading key comment\n");
     }
     c[length]=0;
 
     /* Check that the next two pairs of characters are identical - the
        keyfile is not encrypted, so they should be */
 
-    if (keyfile_get_short(loc,f) != keyfile_get_short(loc,f)) {
-	cfgfatal(loc,"rsa-private","corrupt keyfile\n");
+    if (KEYFILE_GET(16) != KEYFILE_GET(16)) {
+	LDFATAL("corrupt keyfile\n");
     }
 
     /* Read d */
-    length=(keyfile_get_short(loc,f)+7)/8;
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausibly long (%ld) decryption key\n",
+	LDFATAL("implausibly long (%ld) decryption key\n",
 		 length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private",
-			   "error reading decryption key\n");
+	LDFATAL_FILE("error reading decryption key\n");
     }
-    mpz_init(&d);
     read_mpbin(&d,b,length);
-    free(b);
+    FREE(b);
     /* Read iqmp (inverse of q mod p) */
-    length=(keyfile_get_short(loc,f)+7)/8;
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausibly long (%ld)"
+	LDFATAL("implausibly long (%ld)"
 		 " iqmp auxiliary value\n", length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private",
-			   "error reading decryption key\n");
+	LDFATAL_FILE("error reading decryption key\n");
     }
-    mpz_init(&iqmp);
     read_mpbin(&iqmp,b,length);
-    free(b);
+    FREE(b);
     /* Read q (the smaller of the two primes) */
-    length=(keyfile_get_short(loc,f)+7)/8;
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausibly long (%ld) q value\n",
+	LDFATAL("implausibly long (%ld) q value\n",
 		 length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private",
-			   "error reading q value\n");
+	LDFATAL_FILE("error reading q value\n");
     }
-    mpz_init(&st->q);
     read_mpbin(&st->q,b,length);
-    free(b);
+    FREE(b);
     /* Read p (the larger of the two primes) */
-    length=(keyfile_get_short(loc,f)+7)/8;
+    length=(KEYFILE_GET(16)+7)/8;
     if (length>RSA_MAX_MODBYTES) {
-	cfgfatal(loc,"rsa-private","implausibly long (%ld) p value\n",
+	LDFATAL("implausibly long (%ld) p value\n",
 		 length);
     }
     b=safe_malloc(length,"rsapriv_apply");
     if (fread(b,length,1,f)!=1) {
-	cfgfatal_maybefile(f,loc,"rsa-private",
-			   "error reading p value\n");
+	LDFATAL_FILE("error reading p value\n");
     }
-    mpz_init(&st->p);
     read_mpbin(&st->p,b,length);
-    free(b);
+    FREE(b);
     
-    if (fclose(f)!=0) {
-	fatal_perror("rsa-private (%s:%d): fclose",loc.file,loc.line);
+    if (ferror(f)) {
+	fatal_perror("rsa-private (%s:%d): ferror",loc.file,loc.line);
     }
 
     /*
@@ -512,14 +546,7 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
      * values for fast CRT signing.
      */
     valid=False;
-    i=list_elem(args,1);
-    mpz_init(&tmp);
-    mpz_init(&tmp2);
-    mpz_init(&tmp3);
-    if (i && i->type==t_bool && i->data.bool==False) {
-	Message(M_INFO,"rsa-private (%s:%d): skipping RSA key validity "
-		"check\n",loc.file,loc.line);
-    } else {
+    if (do_validity_check) {
 	/* Verify that p*q is equal to n. */
 	mpz_mul(&tmp, &st->p, &st->q);
 	if (mpz_cmp(&tmp, &st->n) != 0)
@@ -559,9 +586,6 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
      *   dq == d mod (q-1)      similarly mod q
      *   w == iqmp * q          so that w == 0 mod q, and w == 1 mod p
      */
-    mpz_init(&st->dp);
-    mpz_init(&st->dq);
-    mpz_init(&st->w);
     mpz_sub_ui(&tmp, &st->p, 1);
     mpz_mod(&st->dp, &d, &tmp);
     mpz_sub_ui(&tmp, &st->q, 1);
@@ -570,19 +594,90 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
     
 done_checks:
     if (!valid) {
-	cfgfatal(loc,"rsa-private","file \"%s\" does not contain a "
-		 "valid RSA key!\n",filename);
+	LDFATAL("file does not contain a "
+		 "valid RSA key!\n");
     }
+
+assume_valid:
+out:
     mpz_clear(&tmp);
     mpz_clear(&tmp2);
     mpz_clear(&tmp3);
 
-    free(c);
+    FREE(b);
+    FREE(c);
     mpz_clear(&e);
     mpz_clear(&d);
     mpz_clear(&iqmp);
 
-assume_valid:
+    return st;
+
+error_out:
+    if (st) rsapriv_dispose(st);
+    st=0;
+    goto out;
+}
+
+static void verror_cfgfatal(struct rsapriv_load_ctx *l,
+			    FILE *maybe_f, bool_t unsup,
+			    const char *message, va_list args)
+{
+    vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args);
+}
+
+static bool_t postreadcheck_apply(struct rsapriv_load_ctx *l, FILE *f)
+{
+    cfgfile_postreadcheck(l->u.apply.loc,f);
+    return True;
+}
+
+static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
+			     list_t *args)
+{
+    struct rsapriv *st;
+    item_t *i;
+    cstring_t filename;
+    FILE *f;
+    struct rsapriv_load_ctx l[1];
+
+    l->verror=verror_cfgfatal;
+    l->postreadcheck=postreadcheck_apply;
+    l->u.apply.loc=loc;
+
+    /* Argument is filename pointing to SSH1 private key file */
+    i=list_elem(args,0);
+    if (i) {
+	if (i->type!=t_string) {
+	    cfgfatal(i->loc,"rsa-private","first argument must be a string\n");
+	}
+	filename=i->data.string;
+    } else {
+	filename=NULL; /* Make compiler happy */
+	cfgfatal(i->loc,"rsa-private","you must provide a filename\n");
+    }
+
+    f=fopen(filename,"rb");
+    if (!f) {
+	if (just_check_config) {
+	    Message(M_WARNING,"rsa-private (%s:%d): cannot open keyfile "
+		    "\"%s\"; assuming it's valid while we check the "
+		    "rest of the configuration\n",loc.file,loc.line,filename);
+	} else {
+	    fatal_perror("rsa-private (%s:%d): cannot open file \"%s\"",
+			 loc.file,loc.line,filename);
+	}
+    }
+
+    bool_t do_validity_check=True;
+    i=list_elem(args,1);
+    if (i && i->type==t_bool && i->data.bool==False) {
+	Message(M_INFO,"rsa-private (%s:%d): skipping RSA key validity "
+		"check\n",loc.file,loc.line);
+	do_validity_check=False;
+    }
+
+    st=rsa_loadpriv_core(l,f,loc,do_validity_check);
+    fclose(f);
     return new_closure(&st->cl);
 }