X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1408a8777732536ede3b60bf21c8606af2782339..45cebe79456e8f4aed005cd233b3b400daa685d0:/sshrsa.c

diff --git a/sshrsa.c b/sshrsa.c
index c9338621..d4f35e28 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -208,7 +208,7 @@ static void *rsa2_newkey(char *data, int len) {
     if (!rsa) return NULL;
     getstring(&data, &len, &p, &slen);
 
-    if (!p || memcmp(p, "ssh-rsa", 7)) {
+    if (!p || slen != 7 || memcmp(p, "ssh-rsa", 7)) {
 	sfree(rsa);
 	return NULL;
     }
@@ -309,6 +309,38 @@ static void *rsa2_createkey(unsigned char *pub_blob, int pub_len,
     return rsa;
 }
 
+static void *rsa2_openssh_createkey(unsigned char **blob, int *len) {
+    char **b = (char **)blob;
+    struct RSAKey *rsa;
+    char *p;
+    int slen;
+
+    rsa = smalloc(sizeof(struct RSAKey));
+    if (!rsa) return NULL;
+    rsa->comment = NULL;
+
+    rsa->modulus = getmp(b, len);
+    rsa->exponent = getmp(b, len);
+    rsa->private_exponent = getmp(b, len);
+    rsa->iqmp = getmp(b, len);
+    rsa->p = getmp(b, len);
+    rsa->q = getmp(b, len);
+
+    if (!rsa->modulus || !rsa->exponent || !rsa->private_exponent ||
+	!rsa->iqmp || !rsa->p || !rsa->q) {
+	sfree(rsa->modulus);
+	sfree(rsa->exponent);
+	sfree(rsa->private_exponent);
+	sfree(rsa->iqmp);
+	sfree(rsa->p);
+	sfree(rsa->q);
+	sfree(rsa);
+	return NULL;
+    }
+
+    return rsa;
+}
+
 static char *rsa2_fingerprint(void *key) {
     struct RSAKey *rsa = (struct RSAKey *)key;
     struct MD5Context md5c;
@@ -455,6 +487,7 @@ const struct ssh_signkey ssh_rsa = {
     rsa2_public_blob,
     rsa2_private_blob,
     rsa2_createkey,
+    rsa2_openssh_createkey,
     rsa2_fingerprint,
     rsa2_verifysig,
     rsa2_sign,