Skip to content

Commit d1b16f2

Browse files
SparkiDevSparkiDev
committed
Regression testing fixes
api.c: z and ret no longer only when !NO_ASN_TIME. benchmark.c: rsaKey array type has changed and unusual code path needsed updating. cmac.c: Zeroization test failed when checkSz was zero as called function didn't zero out cmac. checkSz is invalid. test.c: rsaCaCertDerFile used even when NO_ASN_TIME. test.h: --enable-sp-math only supports DH of 2048 bits and above. Change default DH parameters to be 2048 bits.
1 parent 8684caa commit d1b16f2

File tree

5 files changed

+50
-35
lines changed

5 files changed

+50
-35
lines changed

‎tests/api.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27834,11 +27834,11 @@ static int test_wc_PKCS7_VerifySignedData_RSA(void)
2783427834
struct tm tmpTimeStorage;
2783527835
struct tm* tmpTime = &tmpTimeStorage;
2783627836
#endif
27837-
#ifndef NO_PKCS7_STREAM
27838-
word32 z;
27839-
int ret;
27840-
#endif /* !NO_PKCS7_STREAM */
2784127837
#endif /* !NO_ASN && !NO_ASN_TIME */
27838+
#ifndef NO_PKCS7_STREAM
27839+
word32 z;
27840+
int ret;
27841+
#endif /* !NO_PKCS7_STREAM */
2784227842

2784327843
XMEMSET(&hash, 0, sizeof(wc_HashAlg));
2784427844

‎wolfcrypt/benchmark/benchmark.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8768,12 +8768,12 @@ void bench_rsa(int useDeviceID)
87688768
#elif defined(USE_CERT_BUFFERS_2048) || defined(USE_CERT_BUFFERS_3072)
87698769
bytes = 12;
87708770
#endif
8771-
ret = mp_read_unsigned_bin(rsaKey[i].n, &tmp[bytes], rsaKeySz/8);
8771+
ret = mp_read_unsigned_bin(&rsaKey[i]->n, &tmp[bytes], rsaKeySz/8);
87728772
if (ret != 0) {
87738773
printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
87748774
goto exit;
87758775
}
8776-
ret = mp_set_int(rsaKey[i].e, WC_RSA_EXPONENT);
8776+
ret = mp_set_int(&rsaKey[i]->e, WC_RSA_EXPONENT);
87778777
if (ret != 0) {
87788778
printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
87798779
goto exit;

‎wolfcrypt/src/cmac.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,8 @@ int wc_AesCmacVerify(const byte* check, word32 checkSz,
460460
Cmac cmac[1];
461461
#endif
462462

463-
if (check == NULL || (in == NULL && inSz > 0) || key == NULL || keySz == 0) {
463+
if (check == NULL || checkSz == 0 || (in == NULL && inSz > 0) ||
464+
key == NULL || keySz == 0) {
464465
return BAD_FUNC_ARG;
465466
}
466467

‎wolfcrypt/test/test.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16134,8 +16134,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t memory_test(void)
1613416134
#ifdef WOLFSSL_CERT_GEN
1613516135
static const char* rsaCaCertFile = CERT_ROOT "ca-cert.pem";
1613616136
#endif
16137-
#if (defined(WOLFSSL_ALT_NAMES) || defined(HAVE_PKCS7)) \
16138-
&& !defined(NO_ASN_TIME)
16137+
#if defined(WOLFSSL_ALT_NAMES) || defined(HAVE_PKCS7)
1613916138
static const char* rsaCaCertDerFile = CERT_ROOT "ca-cert.der";
1614016139
#endif
1614116140
#ifdef HAVE_PKCS7

‎wolfssl/test.h‎

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,37 +2541,42 @@ static WC_INLINE void CRL_CallBack(const char* url)
25412541
#endif
25422542

25432543
#ifndef NO_DH
2544-
static WC_INLINE void SetDH(WOLFSSL* ssl)
2545-
{
2546-
/* dh1024 p */
2547-
static const unsigned char p[] =
2544+
#if defined(WOLFSSL_SP_MATH) && !defined(WOLFSS_SP_MATH_ALL)
2545+
/* dh2048 p */
2546+
static const unsigned char test_dh_p[] =
25482547
{
2549-
0xE6, 0x96, 0x9D, 0x3D, 0x49, 0x5B, 0xE3, 0x2C, 0x7C, 0xF1, 0x80, 0xC3,
2550-
0xBD, 0xD4, 0x79, 0x8E, 0x91, 0xB7, 0x81, 0x82, 0x51, 0xBB, 0x05, 0x5E,
2551-
0x2A, 0x20, 0x64, 0x90, 0x4A, 0x79, 0xA7, 0x70, 0xFA, 0x15, 0xA2, 0x59,
2552-
0xCB, 0xD5, 0x23, 0xA6, 0xA6, 0xEF, 0x09, 0xC4, 0x30, 0x48, 0xD5, 0xA2,
2553-
0x2F, 0x97, 0x1F, 0x3C, 0x20, 0x12, 0x9B, 0x48, 0x00, 0x0E, 0x6E, 0xDD,
2554-
0x06, 0x1C, 0xBC, 0x05, 0x3E, 0x37, 0x1D, 0x79, 0x4E, 0x53, 0x27, 0xDF,
2555-
0x61, 0x1E, 0xBB, 0xBE, 0x1B, 0xAC, 0x9B, 0x5C, 0x60, 0x44, 0xCF, 0x02,
2556-
0x3D, 0x76, 0xE0, 0x5E, 0xEA, 0x9B, 0xAD, 0x99, 0x1B, 0x13, 0xA6, 0x3C,
2557-
0x97, 0x4E, 0x9E, 0xF1, 0x83, 0x9E, 0xB5, 0xDB, 0x12, 0x51, 0x36, 0xF7,
2558-
0x26, 0x2E, 0x56, 0xA8, 0x87, 0x15, 0x38, 0xDF, 0xD8, 0x23, 0xC6, 0x50,
2559-
0x50, 0x85, 0xE2, 0x1F, 0x0D, 0xD5, 0xC8, 0x6B,
2548+
0xD3, 0xB2, 0x99, 0x84, 0x5C, 0x0A, 0x4C, 0xE7, 0x37, 0xCC, 0xFC, 0x18,
2549+
0x37, 0x01, 0x2F, 0x5D, 0xC1, 0x4C, 0xF4, 0x5C, 0xC9, 0x82, 0x8D, 0xB7,
2550+
0xF3, 0xD4, 0xA9, 0x8A, 0x9D, 0x34, 0xD7, 0x76, 0x57, 0xE5, 0xE5, 0xC3,
2551+
0xE5, 0x16, 0x85, 0xCA, 0x4D, 0xD6, 0x5B, 0xC1, 0xF8, 0xCF, 0x89, 0x26,
2552+
0xD0, 0x38, 0x8A, 0xEE, 0xF3, 0xCD, 0x33, 0xE5, 0x56, 0xBB, 0x90, 0x83,
2553+
0x9F, 0x97, 0x8E, 0x71, 0xFB, 0x27, 0xE4, 0x35, 0x15, 0x45, 0x86, 0x09,
2554+
0x71, 0xA8, 0x9A, 0xB9, 0x3E, 0x0F, 0x51, 0x8A, 0xC2, 0x75, 0x51, 0x23,
2555+
0x12, 0xFB, 0x94, 0x31, 0x44, 0xBF, 0xCE, 0xF6, 0xED, 0xA6, 0x3A, 0xB7,
2556+
0x92, 0xCE, 0x16, 0xA9, 0x14, 0xB3, 0x88, 0xB7, 0x13, 0x81, 0x71, 0x83,
2557+
0x88, 0xCD, 0xB1, 0xA2, 0x37, 0xE1, 0x59, 0x5C, 0xD0, 0xDC, 0xCA, 0x82,
2558+
0x87, 0xFA, 0x43, 0x44, 0xDD, 0x78, 0x3F, 0xCA, 0x27, 0x7E, 0xE1, 0x6B,
2559+
0x93, 0x19, 0x7C, 0xD9, 0xA6, 0x96, 0x47, 0x0D, 0x12, 0xC1, 0x13, 0xD7,
2560+
0xB9, 0x0A, 0x40, 0xD9, 0x1F, 0xFF, 0xB8, 0xB4, 0x00, 0xC8, 0xAA, 0x5E,
2561+
0xD2, 0x66, 0x4A, 0x05, 0x8E, 0x9E, 0xF5, 0x34, 0xE7, 0xD7, 0x09, 0x7B,
2562+
0x15, 0x49, 0x1D, 0x76, 0x31, 0xD6, 0x71, 0xEC, 0x13, 0x4E, 0x89, 0x8C,
2563+
0x09, 0x22, 0xD8, 0xE7, 0xA3, 0xE9, 0x7D, 0x21, 0x51, 0x26, 0x6E, 0x9F,
2564+
0x30, 0x8A, 0xBB, 0xBC, 0x74, 0xC1, 0xC3, 0x27, 0x6A, 0xCE, 0xA3, 0x12,
2565+
0x60, 0x68, 0x01, 0xD2, 0x34, 0x07, 0x80, 0xCC, 0x2D, 0x7F, 0x5C, 0xAE,
2566+
0xA2, 0x97, 0x40, 0xC8, 0x3C, 0xAC, 0xDB, 0x6F, 0xFE, 0x6C, 0x6D, 0xD2,
2567+
0x06, 0x1C, 0x43, 0xA2, 0xB2, 0x2B, 0x82, 0xB7, 0xD0, 0xAB, 0x3F, 0x2C,
2568+
0xE7, 0x9C, 0x19, 0x16, 0xD1, 0x5E, 0x26, 0x86, 0xC7, 0x92, 0xF9, 0x16,
2569+
0x0B, 0xFA, 0x66, 0x83
25602570
};
25612571

2562-
/* dh1024 g */
2563-
static const unsigned char g[] =
2572+
/* dh2048 g */
2573+
static const unsigned char test_dh_g[] =
25642574
{
25652575
0x02,
25662576
};
2567-
2568-
wolfSSL_SetTmpDH(ssl, p, sizeof(p), g, sizeof(g));
2569-
}
2570-
2571-
static WC_INLINE void SetDHCtx(WOLFSSL_CTX* ctx)
2572-
{
2577+
#else
25732578
/* dh1024 p */
2574-
static const unsigned char p[] =
2579+
static const unsigned char test_dh_p[] =
25752580
{
25762581
0xE6, 0x96, 0x9D, 0x3D, 0x49, 0x5B, 0xE3, 0x2C, 0x7C, 0xF1, 0x80, 0xC3,
25772582
0xBD, 0xD4, 0x79, 0x8E, 0x91, 0xB7, 0x81, 0x82, 0x51, 0xBB, 0x05, 0x5E,
@@ -2587,12 +2592,22 @@ static WC_INLINE void SetDHCtx(WOLFSSL_CTX* ctx)
25872592
};
25882593

25892594
/* dh1024 g */
2590-
static const unsigned char g[] =
2595+
static const unsigned char test_dh_g[] =
25912596
{
25922597
0x02,
25932598
};
2599+
#endif
25942600

2595-
wolfSSL_CTX_SetTmpDH(ctx, p, sizeof(p), g, sizeof(g));
2601+
static WC_INLINE void SetDH(WOLFSSL* ssl)
2602+
{
2603+
wolfSSL_SetTmpDH(ssl, test_dh_p, sizeof(test_dh_p), test_dh_g,
2604+
sizeof(test_dh_g));
2605+
}
2606+
2607+
static WC_INLINE void SetDHCtx(WOLFSSL_CTX* ctx)
2608+
{
2609+
wolfSSL_CTX_SetTmpDH(ctx, test_dh_p, sizeof(test_dh_p), test_dh_g,
2610+
sizeof(test_dh_g));
25962611
}
25972612
#endif /* NO_DH */
25982613

0 commit comments

Comments
 (0)