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

wolfcrypt/test/test.c: fix return values in camellia_test() (also fixes some false positive -Wreturn-stack-addresses from clang++).

Browse Source
This commit is contained in:
Daniel Pouzzner
2025-02-20 16:50:24 -06:00
parent 8aa2799aeb
commit a05436066d
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfcrypt/test/test.c
View File

@@ -17157,18 +17157,18 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
wc_Camellia cam; wc_Camellia cam;
WOLFSSL_SMALL_STACK_STATIC const test_vector_t testVectors[] = WOLFSSL_SMALL_STACK_STATIC const test_vector_t testVectors[] =
{ {
{CAM_ECB_ENC, pte, ive, c1, k1, sizeof(k1), -114}, {CAM_ECB_ENC, pte, ive, c1, k1, sizeof(k1), 114},
{CAM_ECB_ENC, pte, ive, c2, k2, sizeof(k2), -115}, {CAM_ECB_ENC, pte, ive, c2, k2, sizeof(k2), 115},
{CAM_ECB_ENC, pte, ive, c3, k3, sizeof(k3), -116}, {CAM_ECB_ENC, pte, ive, c3, k3, sizeof(k3), 116},
{CAM_ECB_DEC, pte, ive, c1, k1, sizeof(k1), -117}, {CAM_ECB_DEC, pte, ive, c1, k1, sizeof(k1), 117},
{CAM_ECB_DEC, pte, ive, c2, k2, sizeof(k2), -118}, {CAM_ECB_DEC, pte, ive, c2, k2, sizeof(k2), 118},
{CAM_ECB_DEC, pte, ive, c3, k3, sizeof(k3), -119}, {CAM_ECB_DEC, pte, ive, c3, k3, sizeof(k3), 119},
{CAM_CBC_ENC, ptc, ivc, c4, k4, sizeof(k4), -120}, {CAM_CBC_ENC, ptc, ivc, c4, k4, sizeof(k4), 120},
{CAM_CBC_ENC, ptc, ivc, c5, k5, sizeof(k5), -121}, {CAM_CBC_ENC, ptc, ivc, c5, k5, sizeof(k5), 121},
{CAM_CBC_ENC, ptc, ivc, c6, k6, sizeof(k6), -122}, {CAM_CBC_ENC, ptc, ivc, c6, k6, sizeof(k6), 122},
{CAM_CBC_DEC, ptc, ivc, c4, k4, sizeof(k4), -123}, {CAM_CBC_DEC, ptc, ivc, c4, k4, sizeof(k4), 123},
{CAM_CBC_DEC, ptc, ivc, c5, k5, sizeof(k5), -124}, {CAM_CBC_DEC, ptc, ivc, c5, k5, sizeof(k5), 124},
{CAM_CBC_DEC, ptc, ivc, c6, k6, sizeof(k6), -125} {CAM_CBC_DEC, ptc, ivc, c6, k6, sizeof(k6), 125}
}; };
int i, testsSz; int i, testsSz;
int ret; int ret;
@@ -17178,7 +17178,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
for (i = 0; i < testsSz; i++) { for (i = 0; i < testsSz; i++) {
if (wc_CamelliaSetKey(&cam, testVectors[i].key, testVectors[i].keySz, if (wc_CamelliaSetKey(&cam, testVectors[i].key, testVectors[i].keySz,
testVectors[i].iv) != 0) testVectors[i].iv) != 0)
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
switch (testVectors[i].type) { switch (testVectors[i].type) {
case CAM_ECB_ENC: case CAM_ECB_ENC:
@@ -17186,28 +17186,28 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
testVectors[i].plaintext); testVectors[i].plaintext);
if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext, if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_ECB_DEC: case CAM_ECB_DEC:
ret = wc_CamelliaDecryptDirect(&cam, out, ret = wc_CamelliaDecryptDirect(&cam, out,
testVectors[i].ciphertext); testVectors[i].ciphertext);
if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext, if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_CBC_ENC: case CAM_CBC_ENC:
ret = wc_CamelliaCbcEncrypt(&cam, out, testVectors[i].plaintext, ret = wc_CamelliaCbcEncrypt(&cam, out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE); WC_CAMELLIA_BLOCK_SIZE);
if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext, if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_CBC_DEC: case CAM_CBC_DEC:
ret = wc_CamelliaCbcDecrypt(&cam, out, ret = wc_CamelliaCbcDecrypt(&cam, out,
testVectors[i].ciphertext, WC_CAMELLIA_BLOCK_SIZE); testVectors[i].ciphertext, WC_CAMELLIA_BLOCK_SIZE);
if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext, if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
default: default:
break; break;