From 66cfae7b3bcf466f2b332c8110c3c3cff2d265e0 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 21 Mar 2017 20:51:13 -0400
Subject: [PATCH] more memory allocation optimization

---
 Signature.cpp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/Signature.cpp b/Signature.cpp
index 7571760a..12ee6c2c 100644
--- a/Signature.cpp
+++ b/Signature.cpp
@@ -168,14 +168,13 @@ namespace crypto
 				
 				BN_mul (x3, p1.x, p2.x, ctx); // A = x1*x2		
 				BN_mul (y3, p1.y, p2.y, ctx); // B = y1*y2	
-				
+
+				BN_CTX_start (ctx);
 				BIGNUM * t1 = p1.t, * t2 = p2.t;
-				if (!t1) { t1 = BN_new (); BN_mul (t1, p1.x, p1.y, ctx); }
-				if (!t2) { t2 = BN_new (); BN_mul (t2, p2.x, p2.y, ctx); }
+				if (!t1) { t1 = BN_CTX_get (ctx); BN_mul (t1, p1.x, p1.y, ctx); }
+				if (!t2) { t2 = BN_CTX_get (ctx); BN_mul (t2, p2.x, p2.y, ctx); }
 				BN_mul (t3, t1, t2, ctx);
 				BN_mul (t3, t3, d, ctx);  // C = d*t1*t2
-				if (!p1.t) BN_free (t1);
-				if (!p2.t) BN_free (t2);
 
 				if (p1.z)
 				{
@@ -192,7 +191,6 @@ namespace crypto
 						BN_one (z3); // D = 1
 				}	
 
-				BN_CTX_start (ctx);
 				BIGNUM * E = BN_CTX_get (ctx), * F = BN_CTX_get (ctx), * G = BN_CTX_get (ctx), * H = BN_CTX_get (ctx);
 				BN_add (E, p1.x, p1.y);				
 				BN_add (F, p2.x, p2.y);
@@ -213,9 +211,10 @@ namespace crypto
 				return EDDSAPoint {x3, y3, z3, t3};
 			}
 
-			EDDSAPoint Double (const EDDSAPoint& p, BN_CTX * ctx) const
+			void Double (EDDSAPoint& p, BN_CTX * ctx) const
 			{
-				BIGNUM * x2 = BN_new (), * y2 = BN_new (), * z2 = BN_new (), * t2 = BN_new ();
+				BN_CTX_start (ctx);
+				BIGNUM * x2 = BN_CTX_get (ctx), * y2 = BN_CTX_get (ctx), * z2 = BN_CTX_get (ctx), * t2 = BN_CTX_get (ctx);
 				
 				BN_sqr (x2, p.x, ctx); // x2 = A = x^2		
 				BN_sqr (y2, p.y, ctx); // y2 = B = y^2	
@@ -232,7 +231,6 @@ namespace crypto
 				else
 					BN_one (z2); // z2 = 1
 
-				BN_CTX_start (ctx);
 				BIGNUM * E = BN_CTX_get (ctx), * F = BN_CTX_get (ctx), * G = BN_CTX_get (ctx), * H = BN_CTX_get (ctx);
 				// E = (x+y)*(x+y)-A-B = x^2+y^2+2xy-A-B = 2xy
 				BN_mul (E, p.x, p.y, ctx);
@@ -241,14 +239,14 @@ namespace crypto
 				BN_add (G, z2, t2); // G = D + C 
 				BN_add (H, y2, x2); // H = B + A
 
-				BN_mod_mul (x2, E, F, q, ctx); // x2 = E*F
-				BN_mod_mul (y2, G, H, q, ctx); // y2 = G*H	
-				BN_mod_mul (z2, F, G, q, ctx); // z2 = F*G	
-				BN_mod_mul (t2, E, H, q, ctx); // t2 = E*H	
+				BN_mod_mul (p.x, E, F, q, ctx); // x2 = E*F
+				BN_mod_mul (p.y, G, H, q, ctx); // y2 = G*H	
+				if (!p.z) p.z = BN_new ();
+				BN_mod_mul (p.z, F, G, q, ctx); // z2 = F*G	
+				if (!p.t) p.t = BN_new ();
+				BN_mod_mul (p.t, E, H, q, ctx); // t2 = E*H	
 
 				BN_CTX_end (ctx);
-
-				return EDDSAPoint {x2, y2, z2, t2};
 			}
 			
 			EDDSAPoint Mul (const EDDSAPoint& p, const BIGNUM * e, BN_CTX * ctx) const
@@ -261,7 +259,7 @@ namespace crypto
 					int bitCount = BN_num_bits (e);
 					for (int i = bitCount - 1; i >= 0; i--)
 					{
-						res = Double (res, ctx);
+						Double (res, ctx);
 						if (BN_is_bit_set (e, i)) res = Sum (res, p, ctx);
 					}
 				}