feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Remove AssertIntEq from within function.

Browse Source
This commit is contained in:
jrblixt
2017-05-26 09:44:12 -06:00
parent edddd05226
commit 1c0006882a
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/api.c
View File

@@ -3759,7 +3759,11 @@ static int test_wc_Des3_SetIV (void)
/* DES_ENCRYPTION or DES_DECRYPTION */ /* DES_ENCRYPTION or DES_DECRYPTION */
ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION); ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION);
AssertIntEQ(XMEMCMP(iv, des.reg, DES_BLOCK_SIZE), 0); if (ret == 0) {
if (XMEMCMP(iv, des.reg, DES_BLOCK_SIZE) != 0) {
ret = SSL_FATAL_ERROR;
}
}
/* Test explicitly wc_Des3_SetIV() */ /* Test explicitly wc_Des3_SetIV() */
if (ret == 0) { if (ret == 0) {
@@ -3803,7 +3807,11 @@ static int test_wc_Des3_SetKey (void)
/* DES_ENCRYPTION or DES_DECRYPTION */ /* DES_ENCRYPTION or DES_DECRYPTION */
ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION); ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION);
AssertIntEQ(XMEMCMP(iv, des.reg, DES_BLOCK_SIZE), 0); if (ret == 0) {
if (XMEMCMP(iv, des.reg, DES_BLOCK_SIZE) != 0) {
ret = SSL_FATAL_ERROR;
}
}
/* Test bad args. */ /* Test bad args. */
if (ret == 0) { if (ret == 0) {
@@ -3869,17 +3877,24 @@ static int test_wc_Des3_CbcEncryptDecrypt (void)
printf(testingFmt, "wc_Des3_CbcEncrypt()"); printf(testingFmt, "wc_Des3_CbcEncrypt()");
AssertIntEQ(wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION), 0); ret = wc_Des3_SetKey(&des, key, iv, DES_ENCRYPTION);
ret = wc_Des3_CbcEncrypt(&des, cipher, vector, 24);
AssertIntEQ(wc_Des3_SetKey(&des, key, iv, DES_DECRYPTION), 0);
if (ret == 0) { if (ret == 0) {
ret = wc_Des3_CbcDecrypt(&des, plain, cipher, 24); ret = wc_Des3_CbcEncrypt(&des, cipher, vector, 24);
if (ret == 0) {
ret = wc_Des3_SetKey(&des, key, iv, DES_DECRYPTION);
}
if (ret == 0) {
ret = wc_Des3_CbcDecrypt(&des, plain, cipher, 24);
}
} }
AssertIntEQ(XMEMCMP(plain, vector, 24), 0); if (ret == 0) {
if (XMEMCMP(plain, vector, 24) != 0) {
ret = SSL_FATAL_ERROR;
}
}
/* Pass in bad args. */ /* Pass in bad args. */
if (ret == 0) { if (ret == 0) {
@@ -3972,7 +3987,11 @@ static int test_wc_Des3_CbcEncryptDecryptWithKey (void)
ret = wc_Des3_CbcEncryptWithKey(cipher, vector, vectorSz, key, iv); ret = wc_Des3_CbcEncryptWithKey(cipher, vector, vectorSz, key, iv);
if (ret == 0) { if (ret == 0) {
ret = wc_Des3_CbcDecryptWithKey(plain, cipher, cipherSz, key, iv); ret = wc_Des3_CbcDecryptWithKey(plain, cipher, cipherSz, key, iv);
AssertIntEQ(XMEMCMP(plain, vector, 24), 0); if (ret == 0) {
if (XMEMCMP(plain, vector, 24) != 0) {
ret = SSL_FATAL_ERROR;
}
}
} }
/* pass in bad args. */ /* pass in bad args. */