WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3537 from SparkiDev/sp_int_configs 

SP math all: fixes for configurations that don't specify size
pull/3550/head
toddouska 2020-12-09 09:16:46 -08:00 committed by GitHub
parent cbf8e754e0 281ba96bd0
commit 0b78137dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wolfcrypt/src/sp_int.c
View File

@ -4805,7 +4805,7 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
#endif
#ifndef WOLFSSL_SP_SMALL
#ifndef WOLFSSL_HAVE_SP_ECC
#if !defined(WOLFSSL_HAVE_SP_ECC) && defined(HAVE_ECC)
#if SP_WORD_SIZE == 64
#ifndef SQR_MUL_ASM
/* Multiply a by b and store in r: r = a * b
@ -5585,7 +5585,7 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
}
#endif /* SQR_MUL_ASM */
#endif /* SP_WORD_SIZE == 32 */
#endif /* WOLFSSL_HAVE_SP_ECC */
#endif /* !WOLFSSL_HAVE_SP_ECC && HAVE_ECC */
#if defined(SQR_MUL_ASM) && defined(WOLFSSL_SP_INT_LARGE_COMBA)
#if SP_INT_DIGITS >= 32
@ -7579,7 +7579,7 @@ int sp_mul(sp_int* a, sp_int* b, sp_int* r)
}
else
#ifndef WOLFSSL_SP_SMALL
#ifndef WOLFSSL_HAVE_SP_ECC
#if !defined(WOLFSSL_HAVE_SP_ECC) && defined(HAVE_ECC)
#if SP_WORD_SIZE == 64
if ((a->used == 4) && (b->used == 4)) {
err = _sp_mul_4(a, b, r);
@ -7610,7 +7610,7 @@ int sp_mul(sp_int* a, sp_int* b, sp_int* r)
else
#endif /* SQR_MUL_ASM */
#endif /* SP_WORD_SIZE == 32 */
#endif /* WOLFSSL_HAVE_SP_ECC */
#endif /* !WOLFSSL_HAVE_SP_ECC && HAVE_ECC */
#if defined(SQR_MUL_ASM) && defined(WOLFSSL_SP_INT_LARGE_COMBA)
#if SP_INT_DIGITS >= 32
if ((a->used == 16) && (b->used == 16)) {
@ -9515,10 +9515,10 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
return err;
}
#endif /* SQR_MUL_ASM */
#endif
#endif /* !WOLFSSL_SP_MATH || !WOLFSSL_SP_SMALL */
#ifndef WOLFSSL_SP_SMALL
#ifndef WOLFSSL_HAVE_SP_ECC
#if !defined(WOLFSSL_HAVE_SP_ECC) && defined(HAVE_ECC)
#if SP_WORD_SIZE == 64
#ifndef SQR_MUL_ASM
/* Square a and store in r. r = a * a
@ -9646,10 +9646,6 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
#else
sp_int t[1];
#endif
#ifdef WOLFSSL_SP_PPC
tl = 0;
th = 0;
#endif
#ifdef WOLFSSL_SMALL_STACK
if (err == MP_OKAY) {
@ -10210,7 +10206,7 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
}
#endif /* SQR_MUL_ASM */
#endif /* SP_WORD_SIZE == 32 */
#endif /* WOLFSSL_HAVE_SP_ECC */
#endif /* !WOLFSSL_HAVE_SP_ECC && HAVE_ECC */
#if defined(SQR_MUL_ASM) && defined(WOLFSSL_SP_INT_LARGE_COMBA)
#if SP_INT_DIGITS >= 32
@ -11763,7 +11759,7 @@ int sp_sqr(sp_int* a, sp_int* r)
}
else
#ifndef WOLFSSL_SP_SMALL
#ifndef WOLFSSL_HAVE_SP_ECC
#if !defined(WOLFSSL_HAVE_SP_ECC) && defined(HAVE_ECC)
#if SP_WORD_SIZE == 64
if (a->used == 4) {
err = _sp_sqr_4(a, r);
@ -11794,7 +11790,7 @@ int sp_sqr(sp_int* a, sp_int* r)
else
#endif /* SQR_MUL_ASM */
#endif /* SP_WORD_SIZE == 32 */
#endif /* WOLFSSL_HAVE_SP_ECC */
#endif /* !WOLFSSL_HAVE_SP_ECC && HAVE_ECC */
#if defined(SQR_MUL_ASM) && defined(WOLFSSL_SP_INT_LARGE_COMBA)
#if SP_INT_DIGITS >= 32
if (a->used == 16) {
@ -11850,7 +11846,7 @@ int sp_sqr(sp_int* a, sp_int* r)
}
return err;
#endif
#endif /* WOLFSSL_SP_MATH && WOLFSSL_SP_SMALL */
}
/* END SP_SQR implementations */
#endif /* WOLFSSL_SP_MATH_ALL || WOLFSSL_HAVE_SP_DH || HAVE_ECC ||

5
wolfssl/wolfcrypt/sp_int.h
View File

@ -331,8 +331,9 @@ typedef struct sp_ecc_ctx {
#define SP_INT_DIGITS (( 256 + SP_WORD_SIZE) / SP_WORD_SIZE)
#endif
#elif !defined(WOLFSSL_HAVE_SP_RSA) && !defined(WOLFSSL_HAVE_SP_DH)
#if !defined(NO_PWDBASED) && defined(WOLFSSL_SHA512)
#define SP_INT_DIGITS (( 512 + SP_WORD_SIZE) / SP_WORD_SIZE)
#ifdef WOLFSSL_SP_MATH_ALL
#define SP_INT_DIGITS \
((2 * ( 521 + SP_WORD_SIZE) + SP_WORD_SIZE) / SP_WORD_SIZE)
#elif defined(WOLFSSL_SP_384)
#define SP_INT_DIGITS (( 768 + SP_WORD_SIZE) / SP_WORD_SIZE)
#else