From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 10 Jan 2019 19:18:02 +0000 (+0100)
Subject: tls: code shrink
X-Git-Tag: 1_31_0~212
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3109d1f9659ffad76f3cf2c547cc425ed34ae96c;p=oweals%2Fbusybox.git

tls: code shrink

function                                             old     new   delta
lm_add                                                82      78      -4
curve25519                                           793     786      -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-11)             Total: -11 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/tls_fe.c b/networking/tls_fe.c
index f235082f5..10971bbff 100644
--- a/networking/tls_fe.c
+++ b/networking/tls_fe.c
@@ -43,17 +43,13 @@ typedef uint32_t word32;
 #if 0 //UNUSED
 static void fprime_copy(byte *x, const byte *a)
 {
-    int i;
-    for (i = 0; i < F25519_SIZE; i++)
-        x[i] = a[i];
+	memcpy(x, a, F25519_SIZE);
 }
 #endif
 
 static void lm_copy(byte* x, const byte* a)
 {
-    int i;
-    for (i = 0; i < F25519_SIZE; i++)
-        x[i] = a[i];
+	memcpy(x, a, F25519_SIZE);
 }
 
 #if 0 //UNUSED
@@ -200,7 +196,7 @@ static void fe_load(byte *x, word32 c)
 static void fe_normalize(byte *x)
 {
 	byte minusp[F25519_SIZE];
-	word16 c;
+	unsigned c;
 	int i;
 
 	/* Reduce using 2^255 = 19 mod p */
@@ -219,13 +215,13 @@ static void fe_normalize(byte *x)
 	 */
 	c = 19;
 
-	for (i = 0; i + 1 < F25519_SIZE; i++) {
+	for (i = 0; i < F25519_SIZE - 1; i++) {
 		c += x[i];
 		minusp[i] = (byte)c;
 		c >>= 8;
 	}
 
-	c += ((word16)x[i]) - 128;
+	c += ((unsigned)x[i]) - 128;
 	minusp[31] = (byte)c;
 
 	/* Load x-p if no underflow */
@@ -234,13 +230,13 @@ static void fe_normalize(byte *x)
 
 static void lm_add(byte* r, const byte* a, const byte* b)
 {
-	word16 c = 0;
+	unsigned c = 0;
 	int i;
 
 	/* Add */
 	for (i = 0; i < F25519_SIZE; i++) {
 		c >>= 8;
-		c += ((word16)a[i]) + ((word16)b[i]);
+		c += ((unsigned)a[i]) + ((unsigned)b[i]);
 		r[i] = (byte)c;
 	}