wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NID names on NIST prime 192 and 256 curves. Cleanup of the memcpy/memset in .i files to use portable names.

Browse Source
This commit is contained in:
David Garske
2016-06-17 15:59:25 -07:00
parent e8c4950a83
commit eb1d8d5df6
35 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@@ -16341,7 +16341,17 @@ int wolfSSL_EC_GROUP_get_degree(const WOLFSSL_EC_GROUP *group)
} }
switch(group->curve_nid) { switch(group->curve_nid) {
case NID_secp256k1: case NID_secp112r1:
return 112;
case NID_secp128r1:
return 128;
case NID_secp160r1:
return 160;
case NID_X9_62_prime192v1:
return 192;
case NID_secp224r1:
return 224;
case NID_X9_62_prime256v1:
return 256; return 256;
case NID_secp384r1: case NID_secp384r1:
return 384; return 384;

4
wolfcrypt/src/ecc.c
View File

@@ -167,7 +167,7 @@ const ecc_set_type ecc_sets[] = {
#ifdef ECC192 #ifdef ECC192
{ {
24, /* size/bytes */ 24, /* size/bytes */
NID_secp192k1, /* NID */ NID_X9_62_prime192v1, /* NID */
"SECP192R1", /* curve name */ "SECP192R1", /* curve name */
"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", /* prime */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", /* prime */
"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", /* A */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", /* A */
@@ -193,7 +193,7 @@ const ecc_set_type ecc_sets[] = {
#ifdef ECC256 #ifdef ECC256
{ {
32, /* size/bytes */ 32, /* size/bytes */
NID_secp256k1, /* NID */ NID_X9_62_prime256v1, /* NID */
"SECP256R1", /* curve name */ "SECP256R1", /* curve name */
"FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", /* prime */ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", /* prime */
"FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", /* A */ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", /* A */

11
wolfcrypt/src/fp_mont_small.i
View File

@@ -28,10 +28,9 @@ void fp_montgomery_reduce_small(fp_int *a, fp_int *m, fp_digit mp)
fp_digit c[FP_SIZE], *_c, *tmpm, mu, cy; fp_digit c[FP_SIZE], *_c, *tmpm, mu, cy;
int oldused, x, y, pa; int oldused, x, y, pa;
#if defined(USE_MEMSET)
/* now zero the buff */ /* now zero the buff */
memset(c, 0, sizeof c); XMEMSET(c, 0, sizeof c);
#endif
pa = m->used; pa = m->used;
/* copy the input */ /* copy the input */
@@ -39,11 +38,7 @@ void fp_montgomery_reduce_small(fp_int *a, fp_int *m, fp_digit mp)
for (x = 0; x < oldused; x++) { for (x = 0; x < oldused; x++) {
c[x] = a->dp[x]; c[x] = a->dp[x];
} }
#if !defined(USE_MEMSET)
for (; x < 2*pa+3; x++) {
c[x] = 0;
}
#endif
MONT_START; MONT_START;
switch (pa) { switch (pa) {

4
wolfcrypt/src/fp_mul_comba_12.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba12(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[24]; fp_digit c0, c1, c2, at[24];
memcpy(at, A->dp, 12 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 12 * sizeof(fp_digit));
memcpy(at+12, B->dp, 12 * sizeof(fp_digit)); XMEMCPY(at+12, B->dp, 12 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_17.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba17(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[34]; fp_digit c0, c1, c2, at[34];
memcpy(at, A->dp, 17 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 17 * sizeof(fp_digit));
memcpy(at+17, B->dp, 17 * sizeof(fp_digit)); XMEMCPY(at+17, B->dp, 17 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_20.i
View File

@@ -25,8 +25,8 @@ void fp_mul_comba20(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[40]; fp_digit c0, c1, c2, at[40];
memcpy(at, A->dp, 20 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 20 * sizeof(fp_digit));
memcpy(at+20, B->dp, 20 * sizeof(fp_digit)); XMEMCPY(at+20, B->dp, 20 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_24.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba24(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[48]; fp_digit c0, c1, c2, at[48];
memcpy(at, A->dp, 24 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 24 * sizeof(fp_digit));
memcpy(at+24, B->dp, 24 * sizeof(fp_digit)); XMEMCPY(at+24, B->dp, 24 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_28.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba28(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[56]; fp_digit c0, c1, c2, at[56];
memcpy(at, A->dp, 28 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 28 * sizeof(fp_digit));
memcpy(at+28, B->dp, 28 * sizeof(fp_digit)); XMEMCPY(at+28, B->dp, 28 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_3.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba3(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[6]; fp_digit c0, c1, c2, at[6];
memcpy(at, A->dp, 3 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 3 * sizeof(fp_digit));
memcpy(at+3, B->dp, 3 * sizeof(fp_digit)); XMEMCPY(at+3, B->dp, 3 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_32.i
View File

@@ -28,8 +28,8 @@ void fp_mul_comba32(fp_int *A, fp_int *B, fp_int *C)
int out_size; int out_size;
out_size = A->used + B->used; out_size = A->used + B->used;
memcpy(at, A->dp, 32 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 32 * sizeof(fp_digit));
memcpy(at+32, B->dp, 32 * sizeof(fp_digit)); XMEMCPY(at+32, B->dp, 32 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_4.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba4(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[8]; fp_digit c0, c1, c2, at[8];
memcpy(at, A->dp, 4 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 4 * sizeof(fp_digit));
memcpy(at+4, B->dp, 4 * sizeof(fp_digit)); XMEMCPY(at+4, B->dp, 4 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_48.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba48(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[96]; fp_digit c0, c1, c2, at[96];
memcpy(at, A->dp, 48 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 48 * sizeof(fp_digit));
memcpy(at+48, B->dp, 48 * sizeof(fp_digit)); XMEMCPY(at+48, B->dp, 48 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_6.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba6(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[12]; fp_digit c0, c1, c2, at[12];
memcpy(at, A->dp, 6 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 6 * sizeof(fp_digit));
memcpy(at+6, B->dp, 6 * sizeof(fp_digit)); XMEMCPY(at+6, B->dp, 6 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_64.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba64(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[128]; fp_digit c0, c1, c2, at[128];
memcpy(at, A->dp, 64 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 64 * sizeof(fp_digit));
memcpy(at+64, B->dp, 64 * sizeof(fp_digit)); XMEMCPY(at+64, B->dp, 64 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_7.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba7(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[14]; fp_digit c0, c1, c2, at[14];
memcpy(at, A->dp, 7 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 7 * sizeof(fp_digit));
memcpy(at+7, B->dp, 7 * sizeof(fp_digit)); XMEMCPY(at+7, B->dp, 7 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_8.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba8(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[16]; fp_digit c0, c1, c2, at[16];
memcpy(at, A->dp, 8 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 8 * sizeof(fp_digit));
memcpy(at+8, B->dp, 8 * sizeof(fp_digit)); XMEMCPY(at+8, B->dp, 8 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

4
wolfcrypt/src/fp_mul_comba_9.i
View File

@@ -26,8 +26,8 @@ void fp_mul_comba9(fp_int *A, fp_int *B, fp_int *C)
{ {
fp_digit c0, c1, c2, at[18]; fp_digit c0, c1, c2, at[18];
memcpy(at, A->dp, 9 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 9 * sizeof(fp_digit));
memcpy(at+9, B->dp, 9 * sizeof(fp_digit)); XMEMCPY(at+9, B->dp, 9 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

64
wolfcrypt/src/fp_mul_comba_small_set.i
View File

@@ -28,8 +28,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
switch (MAX(A->used, B->used)) { switch (MAX(A->used, B->used)) {
case 1: case 1:
memcpy(at, A->dp, 1 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 1 * sizeof(fp_digit));
memcpy(at+1, B->dp, 1 * sizeof(fp_digit)); XMEMCPY(at+1, B->dp, 1 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -44,8 +44,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 2: case 2:
memcpy(at, A->dp, 2 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 2 * sizeof(fp_digit));
memcpy(at+2, B->dp, 2 * sizeof(fp_digit)); XMEMCPY(at+2, B->dp, 2 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -68,8 +68,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 3: case 3:
memcpy(at, A->dp, 3 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 3 * sizeof(fp_digit));
memcpy(at+3, B->dp, 3 * sizeof(fp_digit)); XMEMCPY(at+3, B->dp, 3 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -100,8 +100,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 4: case 4:
memcpy(at, A->dp, 4 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 4 * sizeof(fp_digit));
memcpy(at+4, B->dp, 4 * sizeof(fp_digit)); XMEMCPY(at+4, B->dp, 4 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -140,8 +140,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 5: case 5:
memcpy(at, A->dp, 5 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 5 * sizeof(fp_digit));
memcpy(at+5, B->dp, 5 * sizeof(fp_digit)); XMEMCPY(at+5, B->dp, 5 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -188,8 +188,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 6: case 6:
memcpy(at, A->dp, 6 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 6 * sizeof(fp_digit));
memcpy(at+6, B->dp, 6 * sizeof(fp_digit)); XMEMCPY(at+6, B->dp, 6 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -244,8 +244,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 7: case 7:
memcpy(at, A->dp, 7 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 7 * sizeof(fp_digit));
memcpy(at+7, B->dp, 7 * sizeof(fp_digit)); XMEMCPY(at+7, B->dp, 7 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -308,8 +308,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 8: case 8:
memcpy(at, A->dp, 8 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 8 * sizeof(fp_digit));
memcpy(at+8, B->dp, 8 * sizeof(fp_digit)); XMEMCPY(at+8, B->dp, 8 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -380,8 +380,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 9: case 9:
memcpy(at, A->dp, 9 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 9 * sizeof(fp_digit));
memcpy(at+9, B->dp, 9 * sizeof(fp_digit)); XMEMCPY(at+9, B->dp, 9 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -460,8 +460,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 10: case 10:
memcpy(at, A->dp, 10 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 10 * sizeof(fp_digit));
memcpy(at+10, B->dp, 10 * sizeof(fp_digit)); XMEMCPY(at+10, B->dp, 10 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -548,8 +548,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 11: case 11:
memcpy(at, A->dp, 11 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 11 * sizeof(fp_digit));
memcpy(at+11, B->dp, 11 * sizeof(fp_digit)); XMEMCPY(at+11, B->dp, 11 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -644,8 +644,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 12: case 12:
memcpy(at, A->dp, 12 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 12 * sizeof(fp_digit));
memcpy(at+12, B->dp, 12 * sizeof(fp_digit)); XMEMCPY(at+12, B->dp, 12 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -748,8 +748,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 13: case 13:
memcpy(at, A->dp, 13 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 13 * sizeof(fp_digit));
memcpy(at+13, B->dp, 13 * sizeof(fp_digit)); XMEMCPY(at+13, B->dp, 13 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -860,8 +860,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 14: case 14:
memcpy(at, A->dp, 14 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 14 * sizeof(fp_digit));
memcpy(at+14, B->dp, 14 * sizeof(fp_digit)); XMEMCPY(at+14, B->dp, 14 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -980,8 +980,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 15: case 15:
memcpy(at, A->dp, 15 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 15 * sizeof(fp_digit));
memcpy(at+15, B->dp, 15 * sizeof(fp_digit)); XMEMCPY(at+15, B->dp, 15 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;
@@ -1108,8 +1108,8 @@ void fp_mul_comba_small(fp_int *A, fp_int *B, fp_int *C)
break; break;
case 16: case 16:
memcpy(at, A->dp, 16 * sizeof(fp_digit)); XMEMCPY(at, A->dp, 16 * sizeof(fp_digit));
memcpy(at+16, B->dp, 16 * sizeof(fp_digit)); XMEMCPY(at+16, B->dp, 16 * sizeof(fp_digit));
COMBA_START; COMBA_START;
COMBA_CLEAR; COMBA_CLEAR;

2
wolfcrypt/src/fp_sqr_comba_12.i
View File

@@ -152,7 +152,7 @@ void fp_sqr_comba12(fp_int *A, fp_int *B)
B->used = 24; B->used = 24;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 24 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 24 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_17.i
View File

@@ -203,7 +203,7 @@ void fp_sqr_comba17(fp_int *A, fp_int *B)
B->used = 34; B->used = 34;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 34 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 34 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_20.i
View File

@@ -233,7 +233,7 @@ void fp_sqr_comba20(fp_int *A, fp_int *B)
B->used = 40; B->used = 40;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 40 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 40 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_24.i
View File

@@ -273,7 +273,7 @@ void fp_sqr_comba24(fp_int *A, fp_int *B)
B->used = 48; B->used = 48;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 48 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 48 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_28.i
View File

@@ -313,7 +313,7 @@ void fp_sqr_comba28(fp_int *A, fp_int *B)
B->used = 56; B->used = 56;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 56 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 56 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_3.i
View File

@@ -63,7 +63,7 @@ void fp_sqr_comba3(fp_int *A, fp_int *B)
B->used = 6; B->used = 6;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 6 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 6 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_32.i
View File

@@ -353,7 +353,7 @@ void fp_sqr_comba32(fp_int *A, fp_int *B)
B->used = 64; B->used = 64;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 64 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 64 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_4.i
View File

@@ -73,7 +73,7 @@ void fp_sqr_comba4(fp_int *A, fp_int *B)
B->used = 8; B->used = 8;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 8 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 8 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_48.i
View File

@@ -513,7 +513,7 @@ void fp_sqr_comba48(fp_int *A, fp_int *B)
B->used = 96; B->used = 96;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 96 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 96 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_6.i
View File

@@ -93,7 +93,7 @@ void fp_sqr_comba6(fp_int *A, fp_int *B)
B->used = 12; B->used = 12;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 12 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 12 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_64.i
View File

@@ -673,7 +673,7 @@ void fp_sqr_comba64(fp_int *A, fp_int *B)
B->used = 128; B->used = 128;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 128 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 128 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_7.i
View File

@@ -103,7 +103,7 @@ void fp_sqr_comba7(fp_int *A, fp_int *B)
B->used = 14; B->used = 14;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 14 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 14 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_8.i
View File

@@ -113,7 +113,7 @@ void fp_sqr_comba8(fp_int *A, fp_int *B)
B->used = 16; B->used = 16;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 16 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 16 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

2
wolfcrypt/src/fp_sqr_comba_9.i
View File

@@ -123,7 +123,7 @@ void fp_sqr_comba9(fp_int *A, fp_int *B)
B->used = 18; B->used = 18;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 18 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 18 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
} }
#endif #endif

32
wolfcrypt/src/fp_sqr_comba_small_set.i
View File

@@ -44,7 +44,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 2; B->used = 2;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 2 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 2 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -73,7 +73,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 4; B->used = 4;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 4 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 4 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -112,7 +112,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 6; B->used = 6;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 6 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 6 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -161,7 +161,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 8; B->used = 8;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 8 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 8 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -220,7 +220,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 10; B->used = 10;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 10 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 10 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -289,7 +289,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 12; B->used = 12;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 12 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 12 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -368,7 +368,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 14; B->used = 14;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 14 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 14 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -457,7 +457,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 16; B->used = 16;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 16 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 16 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -556,7 +556,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 18; B->used = 18;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 18 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 18 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -665,7 +665,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 20; B->used = 20;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 20 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 20 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -784,7 +784,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 22; B->used = 22;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 22 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 22 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -913,7 +913,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 24; B->used = 24;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 24 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 24 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -1052,7 +1052,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 26; B->used = 26;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 26 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 26 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -1201,7 +1201,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 28; B->used = 28;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 28 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 28 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -1360,7 +1360,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 30; B->used = 30;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 30 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 30 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;
@@ -1529,7 +1529,7 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
B->used = 32; B->used = 32;
B->sign = FP_ZPOS; B->sign = FP_ZPOS;
memcpy(B->dp, b, 32 * sizeof(fp_digit)); XMEMCPY(B->dp, b, 32 * sizeof(fp_digit));
fp_clamp(B); fp_clamp(B);
break; break;

4
wolfssl/openssl/ec.h
View File

@@ -16,9 +16,9 @@ enum {
NID_secp112r1 = 0, NID_secp112r1 = 0,
NID_secp128r1 = 1, NID_secp128r1 = 1,
NID_secp160r1 = 2, NID_secp160r1 = 2,
NID_secp192k1 = 3, NID_X9_62_prime192v1 = 3,
NID_secp224r1 = 4, NID_secp224r1 = 4,
NID_secp256k1 = 5, NID_X9_62_prime256v1 = 5,
NID_secp384r1 = 6, NID_secp384r1 = 6,
NID_secp521r1 = 7, NID_secp521r1 = 7,
NID_X9_62_prime_field = 100, NID_X9_62_prime_field = 100,

2
wolfssl/wolfcrypt/mem_track.h
View File

@@ -181,7 +181,7 @@
} }
if (ret && ptr) if (ret && ptr)
memcpy(ret, ptr, sz); XMEMCPY(ret, ptr, sz);
if (ret) { if (ret) {
#ifdef WOLFSSL_DEBUG_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY