X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/baa06aeb963965b4b6a8a8051ec15b72372080dd..refs/tags/v0.1.5:/rsa.c

diff --git a/rsa.c b/rsa.c
index 0b6f147..81fb1b5 100644
--- a/rsa.c
+++ b/rsa.c
@@ -62,6 +62,10 @@ static string_t rsa_sign(void *sst, uint8_t *data, uint32_t datalen)
 
     msize=mpz_sizeinbase(&st->n, 16);
 
+    if (datalen*2+4>=msize) {
+	fatal("rsa_sign: message too big\n");
+    }
+
     strcpy(buff,"0001");
 
     for (i=0; i<datalen; i++) {
@@ -69,7 +73,7 @@ static string_t rsa_sign(void *sst, uint8_t *data, uint32_t datalen)
 	buff[5+i*2]=hexchars[data[i]&0xf];
     }
     buff[4+datalen*2]=0;
-
+    
     for (i=datalen*2+4; i<msize; i++)
 	buff[i]='f';
 
@@ -317,19 +321,25 @@ static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     /* Now do trial signature/check to make sure it's a real keypair:
        sign the comment string! */
-    mpz_init(&sig);
-    mpz_init(&plain);
-    mpz_init(&check);
-    read_mpbin(&plain,c,strlen(c));
-    mpz_powm(&sig, &plain, &st->d, &st->n);
-    mpz_powm(&check, &sig, &e, &st->n);
-    if (mpz_cmp(&plain,&check)!=0) {
-	cfgfatal(loc,"rsa-private","file \"%s\" does not contain a "
-		 "valid RSA key!\n",filename);
+    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);
+    } else {
+	mpz_init(&sig);
+	mpz_init(&plain);
+	mpz_init(&check);
+	read_mpbin(&plain,c,strlen(c));
+	mpz_powm(&sig, &plain, &st->d, &st->n);
+	mpz_powm(&check, &sig, &e, &st->n);
+	if (mpz_cmp(&plain,&check)!=0) {
+	    cfgfatal(loc,"rsa-private","file \"%s\" does not contain a "
+		     "valid RSA key!\n",filename);
+	}
+	mpz_clear(&sig);
+	mpz_clear(&plain);
+	mpz_clear(&check);
     }
-    mpz_clear(&sig);
-    mpz_clear(&plain);
-    mpz_clear(&check);
 
     free(c);
     mpz_clear(&e);