From 378c65045e2d11ac91dcdf16ca6a69382e9b3090 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Fri, 2 Aug 2013 06:28:00 +0000
Subject: [PATCH] Replace some 'sfree' calls of bignums with the proper
 'freebn'.

git-svn-id: svn://svn.tartarus.org/sgt/putty@9979 cda61777-01e9-0310-a592-d414129be87e
---
 sshdss.c | 10 +++++-----
 sshrsa.c | 14 ++++----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/sshdss.c b/sshdss.c
index 2b19a921..6487d75a 100644
--- a/sshdss.c
+++ b/sshdss.c
@@ -433,11 +433,11 @@ static void *dss_openssh_createkey(unsigned char **blob, int *len)
     dss->x = getmp(b, len);
 
     if (!dss->p || !dss->q || !dss->g || !dss->y || !dss->x) {
-	sfree(dss->p);
-	sfree(dss->q);
-	sfree(dss->g);
-	sfree(dss->y);
-	sfree(dss->x);
+	freebn(dss->p);
+	freebn(dss->q);
+	freebn(dss->g);
+	freebn(dss->y);
+	freebn(dss->x);
 	sfree(dss);
 	return NULL;
     }
diff --git a/sshrsa.c b/sshrsa.c
index c4a469ee..11c488e8 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -415,7 +415,7 @@ int rsa_verify(struct RSAKey *key)
     ed = modmul(key->exponent, key->private_exponent, pm1);
     freebn(pm1);
     cmp = bignum_cmp(ed, One);
-    sfree(ed);
+    freebn(ed);
     if (cmp != 0)
 	return 0;
 
@@ -424,7 +424,7 @@ int rsa_verify(struct RSAKey *key)
     ed = modmul(key->exponent, key->private_exponent, qm1);
     freebn(qm1);
     cmp = bignum_cmp(ed, One);
-    sfree(ed);
+    freebn(ed);
     if (cmp != 0)
 	return 0;
 
@@ -450,7 +450,7 @@ int rsa_verify(struct RSAKey *key)
      */
     n = modmul(key->iqmp, key->q, key->p);
     cmp = bignum_cmp(n, One);
-    sfree(n);
+    freebn(n);
     if (cmp != 0)
 	return 0;
 
@@ -707,13 +707,7 @@ static void *rsa2_openssh_createkey(unsigned char **blob, int *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);
+        rsa2_freekey(rsa);
 	return NULL;
     }
 
-- 
2.11.0