wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3600 from douzzer/low-resources-fixes

Browse Source 
--enable-lowresource --enable-sp-math-all
This commit is contained in:
David Garske
2020-12-29 08:01:51 -08:00
committed by GitHub
parent 4280861af0 2bd0d4c467
commit dc21d56545
5 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/client/client.c
View File

@ -3262,7 +3262,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
}
#if defined(OPENSSL_ALL)
#if defined(OPENSSL_ALL) && !defined(NO_SESSION_CACHE)
#ifndef NO_BIO
/* print out session to stdout */
{

2
wolfcrypt/src/evp.c
View File

@ -580,7 +580,7 @@ static int wolfSSL_EVP_CipherUpdate_GCM(WOLFSSL_EVP_CIPHER_CTX *ctx,
*outl = inl;
if (out) {
/* Buffer input for one-shot API */
if (ret == 0) {
if (inl > 0) {
byte* tmp;
tmp = (byte*)XREALLOC(ctx->gcmBuffer,
ctx->gcmBufferLen + inl, NULL,

99
wolfcrypt/test/test.c
View File

@ -20381,12 +20381,12 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
#ifdef HAVE_ECC_KEY_EXPORT
if (exportBuf == NULL)
ERROR_OUT(-9913, done);
ERROR_OUT(-9901, done);
#endif
#ifdef HAVE_ECC_SIGN
if ((sig == NULL) || (digest == NULL))
ERROR_OUT(-9901, done);
ERROR_OUT(-9902, done);
#endif
#endif /* WOLFSSL_SMALL_STACK */
@ -20398,7 +20398,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
if ((userA == NULL) ||
(userB == NULL) ||
(pubKey == NULL))
ERROR_OUT(-9902, done);
ERROR_OUT(-9903, done);
#endif
XMEMSET(userA, 0, sizeof *userA);
@ -20407,62 +20407,62 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_init_ex(userA, HEAP_HINT, devId);
if (ret != 0)
goto done;
ERROR_OUT(-9904, done);
ret = wc_ecc_init_ex(userB, HEAP_HINT, devId);
if (ret != 0)
goto done;
ERROR_OUT(-9905, done);
ret = wc_ecc_init_ex(pubKey, HEAP_HINT, devId);
if (ret != 0)
goto done;
ERROR_OUT(-9906, done);
#ifdef WOLFSSL_CUSTOM_CURVES
if (dp != NULL) {
ret = wc_ecc_set_custom_curve(userA, dp);
if (ret != 0)
goto done;
ERROR_OUT(-9907, done);
ret = wc_ecc_set_custom_curve(userB, dp);
if (ret != 0)
goto done;
ERROR_OUT(-9908, done);
}
#endif
ret = wc_ecc_make_key_ex(rng, keySize, userA, curve_id);
if (ret != 0)
ERROR_OUT(-9909, done);
#if defined(WOLFSSL_ASYNC_CRYPT)
ret = wc_AsyncWait(ret, &userA->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
if (ret != 0)
goto done;
ERROR_OUT(-9910, done);
TEST_SLEEP();
if (wc_ecc_get_curve_idx(curve_id) != -1) {
curveSize = wc_ecc_get_curve_size_from_id(userA->dp->id);
if (curveSize != userA->dp->size) {
ret = -9903;
goto done;
}
if (curveSize != userA->dp->size)
ERROR_OUT(-9911, done);
}
ret = wc_ecc_check_key(userA);
if (ret != 0)
goto done;
ERROR_OUT(-9912, done);
TEST_SLEEP();
/* ATECC508/608 configuration may not support more than one ECDH key */
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A)
ret = wc_ecc_make_key_ex(rng, keySize, userB, curve_id);
if (ret != 0)
ERROR_OUT(-9913, done);
#if defined(WOLFSSL_ASYNC_CRYPT)
ret = wc_AsyncWait(ret, &userB->asyncDev, WC_ASYNC_FLAG_NONE);
#endif
if (ret != 0)
goto done;
ERROR_OUT(-9914, done);
TEST_SLEEP();
/* only perform the below tests if the key size matches */
if (dp == NULL && keySize > 0 && wc_ecc_size(userA) != keySize) {
ret = ECC_CURVE_OID_E;
goto done;
}
if (dp == NULL && keySize > 0 && wc_ecc_size(userA) != keySize)
ERROR_OUT(ECC_CURVE_OID_E, done);
#ifdef HAVE_ECC_DHE
#if defined(ECC_TIMING_RESISTANT) && (!defined(HAVE_FIPS) || \
@ -20470,10 +20470,10 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
!defined(HAVE_SELFTEST)
ret = wc_ecc_set_rng(userA, rng);
if (ret != 0)
goto done;
ERROR_OUT(-9915, done);
ret = wc_ecc_set_rng(userB, rng);
if (ret != 0)
goto done;
ERROR_OUT(-9916, done);
#endif
x = ECC_SHARED_SIZE;
@ -20485,7 +20485,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_shared_secret(userA, userB, sharedA, &x);
} while (ret == WC_PENDING_E);
if (ret != 0) {
goto done;
ERROR_OUT(-9917, done);
}
TEST_SLEEP();
@ -20498,13 +20498,13 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_shared_secret(userB, userA, sharedB, &y);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9918, done);
if (y != x)
ERROR_OUT(-9904, done);
ERROR_OUT(-9919, done);
if (XMEMCMP(sharedA, sharedB, x))
ERROR_OUT(-9905, done);
ERROR_OUT(-9920, done);
TEST_SLEEP();
#endif /* HAVE_ECC_DHE */
@ -20521,9 +20521,8 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
if (ret == 0)
ret = wc_ecc_shared_secret(userA, userB, sharedA, &x);
} while (ret == WC_PENDING_E);
if (ret != 0) {
goto done;
}
if (ret != 0)
ERROR_OUT(-9921, done);
TEST_SLEEP();
y = ECC_SHARED_SIZE;
@ -20535,13 +20534,13 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_shared_secret(userB, userA, sharedB, &y);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9922, done);
if (y != x)
ERROR_OUT(-9906, done);
ERROR_OUT(-9923, done);
if (XMEMCMP(sharedA, sharedB, x))
ERROR_OUT(-9907, done);
ERROR_OUT(-9924, done);
TEST_SLEEP();
/* remove cofactor flag */
@ -20554,18 +20553,19 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
x = ECC_KEY_EXPORT_BUF_SIZE;
ret = wc_ecc_export_x963_ex(userA, exportBuf, &x, 0);
if (ret != 0)
goto done;
ERROR_OUT(-9925, done);
#ifdef HAVE_ECC_KEY_IMPORT
#ifdef WOLFSSL_CUSTOM_CURVES
if (dp != NULL) {
ret = wc_ecc_set_custom_curve(pubKey, dp);
if (ret != 0) goto done;
if (ret != 0)
ERROR_OUT(-9926, done);
}
#endif
ret = wc_ecc_import_x963_ex(exportBuf, x, pubKey, curve_id);
if (ret != 0)
goto done;
ERROR_OUT(-9927, done);
#if !defined(WOLFSSL_ATECC508A) && !defined(WOLFSSL_ATECC608A)
#ifdef HAVE_ECC_DHE
@ -20578,10 +20578,10 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_shared_secret(userB, pubKey, sharedB, &y);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9928, done);
if (XMEMCMP(sharedA, sharedB, y))
ERROR_OUT(-9908, done);
ERROR_OUT(-9929, done);
TEST_SLEEP();
#endif /* HAVE_ECC_DHE */
@ -20590,21 +20590,22 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
x = ECC_KEY_EXPORT_BUF_SIZE;
ret = wc_ecc_export_x963_ex(userA, exportBuf, &x, 1);
if (ret != 0)
goto done;
ERROR_OUT(-9930, done);
wc_ecc_free(pubKey);
ret = wc_ecc_init_ex(pubKey, HEAP_HINT, devId);
if (ret != 0)
goto done;
ERROR_OUT(-9931, done);
#ifdef WOLFSSL_CUSTOM_CURVES
if (dp != NULL) {
ret = wc_ecc_set_custom_curve(pubKey, dp);
if (ret != 0) goto done;
if (ret != 0)
ERROR_OUT(-9932, done);
}
#endif
ret = wc_ecc_import_x963_ex(exportBuf, x, pubKey, curve_id);
if (ret != 0)
goto done;
ERROR_OUT(-9933, done);
#ifdef HAVE_ECC_DHE
y = ECC_SHARED_SIZE;
@ -20616,10 +20617,10 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
ret = wc_ecc_shared_secret(userB, pubKey, sharedB, &y);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9934, done);
if (XMEMCMP(sharedA, sharedB, y))
ERROR_OUT(-9909, done);
ERROR_OUT(-9935, done);
TEST_SLEEP();
#endif /* HAVE_ECC_DHE */
#endif /* HAVE_COMP_KEY */
@ -20647,7 +20648,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
userA);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9936, done);
TEST_SLEEP();
#ifdef HAVE_ECC_VERIFY
@ -20662,9 +20663,9 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
&verify, userA);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9937, done);
if (verify != 1)
ERROR_OUT(-9910, done);
ERROR_OUT(-9938, done);
TEST_SLEEP();
}
#endif /* HAVE_ECC_VERIFY */
@ -20685,7 +20686,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
userA);
} while (ret == WC_PENDING_E);
if (ret != 0)
ERROR_OUT(-9911, done);
ERROR_OUT(-9939, done);
TEST_SLEEP();
#ifdef HAVE_ECC_VERIFY
@ -20700,9 +20701,9 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
&verify, userA);
} while (ret == WC_PENDING_E);
if (ret != 0)
goto done;
ERROR_OUT(-9940, done);
if (verify != 1)
ERROR_OUT(-9912, done);
ERROR_OUT(-9941, done);
TEST_SLEEP();
}
#endif /* HAVE_ECC_VERIFY */
@ -20713,7 +20714,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount,
x = ECC_KEY_EXPORT_BUF_SIZE;
ret = wc_ecc_export_private_only(userA, exportBuf, &x);
if (ret != 0)
goto done;
ERROR_OUT(-9942, done);
#endif /* HAVE_ECC_KEY_EXPORT */
done:

3
wolfssl/wolfcrypt/ecc.h
View File

@ -322,7 +322,8 @@ typedef struct ecc_set_type {
#endif
/* determine buffer size */
#define FP_SIZE_ECC (FP_MAX_BITS_ECC/DIGIT_BIT)
/* Add one to accommodate extra digit used by sp_mul(), sp_mulmod(), sp_sqr(), and sp_sqrmod(). */
#define FP_SIZE_ECC ((FP_MAX_BITS_ECC/DIGIT_BIT) + 1)
/* This needs to match the size of the fp_int struct, except the

29
wolfssl/wolfcrypt/sp_int.h
View File

@ -319,9 +319,10 @@ typedef struct sp_ecc_ctx {
/* Calculate number of digits to have in an sp_int based maximum size of
* numbers in bits that will be used.
* Double the size to hold multiplication result.
* Add one to accommodate extra digit used by sp_mul(), sp_mulmod(), sp_sqr(), and sp_sqrmod().
*/
#define SP_INT_DIGITS \
(((SP_INT_BITS + (SP_WORD_SIZE - 1)) * 2 + SP_WORD_SIZE) / SP_WORD_SIZE)
((((SP_INT_BITS + (SP_WORD_SIZE - 1)) * 2 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#ifndef SP_INT_DIGITS
@ -331,41 +332,41 @@ typedef struct sp_ecc_ctx {
#if !defined(WOLFSSL_HAVE_SP_RSA) && !defined(WOLFSSL_HAVE_SP_DH) && \
!defined(WOLFSSL_HAVE_SP_ECC)
#if !defined(NO_RSA) || !defined(NO_DH) || !defined(NO_DSA)
#define SP_INT_DIGITS ((6144 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((6144 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#elif defined(HAVE_ECC)
#define SP_INT_DIGITS \
((2 * ( 521 + SP_WORD_SIZE) + SP_WORD_SIZE) / SP_WORD_SIZE)
(((2 * ( 521 + SP_WORD_SIZE) + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#elif !defined(NO_PWDBASED) && defined(WOLFSSL_SHA512)
#define SP_INT_DIGITS (( 512 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS ((( 512 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#else
#define SP_INT_DIGITS (( 256 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS ((( 256 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#elif !defined(WOLFSSL_HAVE_SP_RSA) && !defined(WOLFSSL_HAVE_SP_DH)
#ifdef WOLFSSL_SP_MATH_ALL
#define SP_INT_DIGITS \
((2 * ( 521 + SP_WORD_SIZE) + SP_WORD_SIZE) / SP_WORD_SIZE)
(((2 * ( 521 + SP_WORD_SIZE) + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#elif defined(WOLFSSL_SP_384)
#define SP_INT_DIGITS (( 768 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS ((( 768 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#else
#define SP_INT_DIGITS (( 512 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS ((( 512 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#elif defined(WOLFSSL_SP_4096)
#if defined(WOLFSSL_HAVE_SP_DH)
#define SP_INT_DIGITS ((8192 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((8192 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#else
#define SP_INT_DIGITS ((4096 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((4096 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#elif !defined(WOLFSSL_SP_NO_3072)
#if defined(WOLFSSL_HAVE_SP_DH)
#define SP_INT_DIGITS ((6144 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((6144 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#else
#define SP_INT_DIGITS ((3072 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((3072 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#else
#if defined(WOLFSSL_HAVE_SP_DH)
#define SP_INT_DIGITS ((4096 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((4096 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#else
#define SP_INT_DIGITS ((2048 + SP_WORD_SIZE) / SP_WORD_SIZE)
#define SP_INT_DIGITS (((2048 + SP_WORD_SIZE) / SP_WORD_SIZE) + 1)
#endif
#endif
#endif