aboutsummaryrefslogtreecommitdiff
path: root/tests/test.c
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2024-03-30 09:57:04 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2024-03-30 09:57:04 -0400
commit5184d7db93131056215b9263740f4806495f148c (patch)
tree1e233670a0ad1940085efe4628d30d312d3b0e8c /tests/test.c
parent21f6c0a9cdd5ed67e48bb1f39f72217b5fe4758f (diff)
Squashed commit of the following:
commit 8e3d6ea5e3c83fe42cb904b6ccc4fe2b73f76aae Author: vnugent <public@vaughnnugent.com> Date: Sat Mar 30 09:52:55 2024 -0400 refactor!: Some api (struct) changes and updated tests commit e88e8420520204e20802516f01d4488bb0b1d6ea Merge: 490dfee 21f6c0a Author: vnugent <public@vaughnnugent.com> Date: Sun Mar 3 15:02:34 2024 -0500 Merge branch 'master' into develop commit 490dfee4ef22479009627435c6ad728c3cbbab54 Author: vnugent <public@vaughnnugent.com> Date: Sun Mar 3 14:59:25 2024 -0500 test: #3 tests for encryption/description and Macs commit efa97490b7ed47f4e2f05bee52e2b33e14e439e6 Merge: 1b84e3c 120022a Author: vnugent <public@vaughnnugent.com> Date: Sun Mar 3 14:55:48 2024 -0500 merge master commit 1b84e3c7c2e55b1ff9ffdd09b66873e11c131441 Author: vnugent <public@vaughnnugent.com> Date: Sat Mar 2 22:57:36 2024 -0500 fix: #2 constent usage of sizeof() operator on struct types commit 9de5a214c66adea0ef2d0bac63c59449de202a88 Author: vnugent <public@vaughnnugent.com> Date: Fri Mar 1 14:30:36 2024 -0500 perf: avoid nc_key struct copy, cast and verify instead commit b917b761120ed684af28d0707673ffadcf14b8fe Author: vnugent <public@vaughnnugent.com> Date: Mon Feb 12 22:06:50 2024 -0500 fix: found the constant time memcompare function commit 9f85fff3b9f25da7410569ea94f994b88feb3910 Author: vnugent <public@vaughnnugent.com> Date: Fri Feb 9 22:48:35 2024 -0500 feat: added/update MAC functions to sign or verify nip44 payload commit aa5113741bb419b02d6ea416bba571fa3d65db46 Author: vnugent <public@vaughnnugent.com> Date: Wed Feb 7 01:37:53 2024 -0500 add missing hmac-key output buffer commit 55f47d22cc9ce4d1e22b70814d608c7ef3b1bbc9 Author: vnugent <public@vaughnnugent.com> Date: Sun Feb 4 21:08:13 2024 -0500 simple bug fixes, and public api argument validation tests commit 73c5a713fb164ae8b4ac8a891a8020e08eae0a3b Author: vnugent <public@vaughnnugent.com> Date: Fri Feb 2 23:05:48 2024 -0500 update api to return secpvalidate return code instead of internal return codes commit 06c73004e1a39a7ea4ea3a89c22dee0f66adb236 Author: vnugent <public@vaughnnugent.com> Date: Fri Feb 2 19:25:17 2024 -0500 change to lgpl license commit 6e79fdb3b6b6739fc7797d47e55a7691306cf736 Author: vnugent <public@vaughnnugent.com> Date: Wed Jan 31 21:30:49 2024 -0500 move validation macros, and optionally disable them commit ac1e58837f1ba687939f78b5c03cadd346c10ddd Author: vnugent <public@vaughnnugent.com> Date: Tue Jan 30 12:25:05 2024 -0500 couple more tests, renable range checks, set flags for all projects
Diffstat (limited to 'tests/test.c')
-rw-r--r--tests/test.c66
1 files changed, 38 insertions, 28 deletions
diff --git a/tests/test.c b/tests/test.c
index 09e195b..e3188dc 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -272,12 +272,20 @@ static int TestPublicApiArgumentValidation(void)
uint8_t sig64[64];
NCSecretKey secKey;
NCPublicKey pubKey;
- NCCryptoData cryptoData;
uint8_t hmacKeyOut[NC_HMAC_KEY_SIZE];
+ uint8_t nonce[NC_ENCRYPTION_NONCE_SIZE];
+
+ NCCryptoData cryptoData = {
+ .dataSize = sizeof(zero32),
+ .inputData = zero32,
+ .outputData = sig64, //just an arbitrary writeable buffer
+ .nonce32 = nonce
+ };
PRINTL("TEST: Public API argument validation tests")
FillRandomData(ctxRandom, 32);
+ FillRandomData(nonce, sizeof(nonce));
//Test null context
TEST(NCInitContext(NULL, ctxRandom), ARG_ERROR_POS_0)
@@ -326,13 +334,7 @@ static int TestPublicApiArgumentValidation(void)
TEST(NCSignDigest(&ctx, &secKey, zero32, NULL, sig64), ARG_ERROR_POS_3)
TEST(NCSignDigest(&ctx, &secKey, zero32, zero32, NULL), ARG_ERROR_POS_4)
-
- //Encrypt
- cryptoData.dataSize = 32;
- cryptoData.inputData = zero32;
- cryptoData.outputData = sig64;
- FillRandomData(&cryptoData.nonce, 32);
-
+ //Test null encrypt args
TEST(NCEncrypt(NULL, &secKey, &pubKey, hmacKeyOut, &cryptoData), ARG_ERROR_POS_0)
TEST(NCEncrypt(&ctx, NULL, &pubKey, hmacKeyOut, &cryptoData), ARG_ERROR_POS_1)
TEST(NCEncrypt(&ctx, &secKey, NULL, hmacKeyOut, &cryptoData), ARG_ERROR_POS_2)
@@ -387,9 +389,12 @@ static int TestPublicApiArgumentValidation(void)
}
{
- NCMacVerifyArgs macArgs;
- macArgs.payload = zero32;
- macArgs.payloadSize = 32;
+ NCMacVerifyArgs macArgs = {
+ .payload = zero32,
+ .payloadSize = 32,
+ .mac32 = zero32,
+ .nonce32 = zero32
+ };
TEST(NCVerifyMac(NULL, &secKey, &pubKey, &macArgs), ARG_ERROR_POS_0)
TEST(NCVerifyMac(&ctx, NULL, &pubKey, &macArgs), ARG_ERROR_POS_1)
@@ -450,21 +455,38 @@ static int TestCorrectEncryption(NCContext* context)
NCSecretKey secKey2;
NCPublicKey pubKey2;
-
- NCCryptoData cryptoData;
- NCMacVerifyArgs macVerifyArgs;
+
uint8_t hmacKeyOut[NC_HMAC_KEY_SIZE];
+ uint8_t nonce[NC_ENCRYPTION_NONCE_SIZE];
+ uint8_t mac[NC_ENCRYPTION_MAC_SIZE];
uint8_t plainText[TEST_ENC_DATA_SIZE];
uint8_t cipherText[TEST_ENC_DATA_SIZE];
uint8_t decryptedText[TEST_ENC_DATA_SIZE];
+ /* setup the crypto data structure */
+ NCCryptoData cryptoData = {
+ .dataSize = TEST_ENC_DATA_SIZE,
+ .inputData = plainText,
+ .outputData = cipherText,
+ .nonce32 = nonce
+ };
+
+ NCMacVerifyArgs macVerifyArgs = {
+ .nonce32 = nonce,
+ .mac32 = mac,
+ .payload = cipherText,
+ .payloadSize = TEST_ENC_DATA_SIZE
+ };
+
PRINTL("TEST: Correct encryption")
/* init a sending and receiving key */
FillRandomData(&secKey1, sizeof(NCSecretKey));
FillRandomData(&secKey2, sizeof(NCSecretKey));
FillRandomData(plainText, sizeof(plainText));
+ /* nonce is shared */
+ FillRandomData(nonce, sizeof(nonce));
ENSURE(NCValidateSecretKey(context, &secKey1) == 1);
ENSURE(NCValidateSecretKey(context, &secKey2) == 1);
@@ -472,17 +494,10 @@ static int TestCorrectEncryption(NCContext* context)
ENSURE(NCGetPublicKey(context, &secKey1, &pubKey1) == NC_SUCCESS);
ENSURE(NCGetPublicKey(context, &secKey2, &pubKey2) == NC_SUCCESS);
- /* setup the crypto data structure */
- cryptoData.dataSize = TEST_ENC_DATA_SIZE;
- cryptoData.inputData = plainText;
- cryptoData.outputData = cipherText;
- /* add a random nonce, we will keep it stored in the nonce field of the struct */
- FillRandomData(cryptoData.nonce, NC_ENCRYPTION_NONCE_SIZE);
-
/* Try to encrypt the data from sec1 to pub2 */
TEST(NCEncrypt(context, &secKey1, &pubKey2, hmacKeyOut, &cryptoData), NC_SUCCESS);
- //swap texts
+ //swap cipher and plain text for decryption
cryptoData.inputData = cipherText;
cryptoData.outputData = decryptedText;
@@ -492,13 +507,8 @@ static int TestCorrectEncryption(NCContext* context)
/* Ensure the decrypted text matches the original */
TEST(memcmp(plainText, decryptedText, sizeof(plainText)), 0);
- /* Also try to validate the payload mac */
- memmove(macVerifyArgs.nonce, cryptoData.nonce, NC_ENCRYPTION_NONCE_SIZE);
- macVerifyArgs.payload = cipherText;
- macVerifyArgs.payloadSize = TEST_ENC_DATA_SIZE;
-
/* Compute message mac on ciphertext */
- TEST(NCComputeMac(context, hmacKeyOut, cipherText, sizeof(cipherText), macVerifyArgs.mac), NC_SUCCESS);
+ TEST(NCComputeMac(context, hmacKeyOut, cipherText, sizeof(cipherText), mac), NC_SUCCESS);
/* Verify the mac */
TEST(NCVerifyMac(context, &secKey1, &pubKey2, &macVerifyArgs), NC_SUCCESS);