X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7cca0d811c4d1b5bb346cd60fdfa461a558aefec..a52f067e0510f49ff0473878280521bd11cd3c78:/sshrsa.c?ds=sidebyside

diff --git a/sshrsa.c b/sshrsa.c
index bd92c7bd..324fbd1d 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -43,9 +43,12 @@ int makekey(unsigned char *data, struct RSAKey *result,
     unsigned char *p = data;
     int i;
 
-    result->bits = 0;
-    for (i=0; i<4; i++)
-	result->bits = (result->bits << 8) + *p++;
+    if (result) {
+        result->bits = 0;
+        for (i=0; i<4; i++)
+            result->bits = (result->bits << 8) + *p++;
+    } else
+        p += 4;
 
     /*
      * order=0 means exponent then modulus (the keys sent by the
@@ -54,12 +57,13 @@ int makekey(unsigned char *data, struct RSAKey *result,
      */
 
     if (order == 0)
-        p += ssh1_read_bignum(p, &result->exponent);
-    result->bytes = (((p[0] << 8) + p[1]) + 7) / 8;
+        p += ssh1_read_bignum(p, result ? &result->exponent : NULL);
+    if (result)
+        result->bytes = (((p[0] << 8) + p[1]) + 7) / 8;
     if (keystr) *keystr = p+2;
-    p += ssh1_read_bignum(p, &result->modulus);
+    p += ssh1_read_bignum(p, result ? &result->modulus : NULL);
     if (order == 1)
-        p += ssh1_read_bignum(p, &result->exponent);
+        p += ssh1_read_bignum(p, result ? &result->exponent : NULL);
 
     return p - data;
 }
@@ -156,6 +160,13 @@ void rsastr_fmt(char *str, struct RSAKey *key) {
     str[len] = '\0';
 }
 
+void freersakey(struct RSAKey *key) {
+    if (key->modulus) freebn(key->modulus);
+    if (key->exponent) freebn(key->exponent);
+    if (key->private_exponent) freebn(key->private_exponent);
+    if (key->comment) free(key->comment);
+}
+
 #ifdef TESTMODE
 
 #ifndef NODDY