Skip to content

Add parantheses around the use of sizeof operator #2471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hussain1811 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −31
Open

Add parantheses around the use of sizeof operator #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/test_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ OQS_STATUS test_sig_bitflip(OQS_SIG *sig, uint8_t *message, size_t message_len,
} else {
rc = OQS_SIG_verify(sig, message, message_len, signature, signature_len, public_key);
}
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_ERROR) {
fprintf(stderr, "ERROR: OQS_SIG_verify should have failed after flipping bit %llu of the %s!\n", (unsigned long long)bit_index, (test == 0) ? "message" : "signature");
return OQS_ERROR;
Expand Down Expand Up @@ -243,7 +243,7 @@ OQS_STATUS test_sig_stfl_bitflip(OQS_SIG_STFL *sig, uint8_t *message, size_t mes
}
/* check that the verification fails */
rc = OQS_SIG_STFL_verify(sig, message, message_len, signature, signature_len, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_ERROR) {
fprintf(stderr, "ERROR: OQS_SIG_STFL_verify should have failed after flipping bit %llu of the %s!\n", (unsigned long long)bit_index, (test == 0) ? "message" : "signature");
return OQS_ERROR;
Expand Down
16 changes: 8 additions & 8 deletions tests/test_kem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static bool mlkem_rej_testcase(OQS_KEM *kem, uint8_t *ciphertext, uint8_t *secre
// Calculate expected secret in case of corrupted cipher: shake256(z || c)
OQS_SHA3_shake256(shared_secret_r, MLKEM_SECRET_LEN, buff_z_c, length_z_c);
rc = OQS_KEM_decaps(kem, shared_secret_d, ciphertext, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_KEM_decaps failed for rejection testcase scenario 1\n");
goto cleanup;
Expand All @@ -82,7 +82,7 @@ static bool mlkem_rej_testcase(OQS_KEM *kem, uint8_t *ciphertext, uint8_t *secre
// Calculate expected secret in case of corrupted cipher: shake256(z || c)
OQS_SHA3_shake256(shared_secret_r, MLKEM_SECRET_LEN, buff_z_c, length_z_c);
rc = OQS_KEM_decaps(kem, shared_secret_d, ciphertext, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_KEM_decaps failed for rejection testcase scenario 2\n");
goto cleanup;
Expand Down Expand Up @@ -201,7 +201,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {
OQS_randombytes(keypair_seed, kem->length_keypair_seed);
}
rc = OQS_KEM_keypair_derand(kem, public_key, secret_key, keypair_seed);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (kem->length_keypair_seed == 0) {
// If length_keypair_seed is set to 0 for this KEM scheme, a failure is expected
if (rc != OQS_ERROR) {
Expand All @@ -219,7 +219,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {
}
} else {
rc = OQS_KEM_keypair(kem, public_key, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_KEM_keypair failed\n");
goto err;
Expand All @@ -233,7 +233,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {
OQS_randombytes(encaps_seed, kem->length_encaps_seed);
}
rc = OQS_KEM_encaps_derand(kem, ciphertext, shared_secret_e, public_key, encaps_seed);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (kem->length_encaps_seed == 0) {
// If length_encaps_seed is set to 0 for this KEM scheme, a failure is expected
if (rc != OQS_ERROR) {
Expand All @@ -251,7 +251,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {
}
} else {
rc = OQS_KEM_encaps(kem, ciphertext, shared_secret_e, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_KEM_encaps failed\n");
goto err;
Expand All @@ -260,7 +260,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {

OQS_TEST_CT_DECLASSIFY(ciphertext, kem->length_ciphertext);
rc = OQS_KEM_decaps(kem, shared_secret_d, ciphertext, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_KEM_decaps failed\n");
goto err;
Expand Down Expand Up @@ -290,7 +290,7 @@ static OQS_STATUS kem_test_correctness(const char *method_name, bool derand) {
OQS_TEST_CT_DECLASSIFY(ciphertext, kem->length_ciphertext);
rc = OQS_KEM_decaps(kem, shared_secret_d, ciphertext, secret_key);
OQS_TEST_CT_DECLASSIFY(shared_secret_d, kem->length_shared_secret);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc == OQS_SUCCESS && memcmp(shared_secret_e, shared_secret_d, kem->length_shared_secret) == 0) {
fprintf(stderr, "ERROR: OQS_KEM_decaps succeeded on wrong input\n");
goto err;
Expand Down
22 changes: 11 additions & 11 deletions tests/test_sig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
OQS_TEST_CT_DECLASSIFY(message, message_len);

rc = OQS_SIG_keypair(sig, public_key, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_keypair failed\n");
goto err;
}

rc = OQS_SIG_sign(sig, signature, &signature_len, message, message_len, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_sign failed\n");
goto err;
Expand All @@ -114,15 +114,15 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
OQS_TEST_CT_DECLASSIFY(public_key, sig->length_public_key);
OQS_TEST_CT_DECLASSIFY(signature, signature_len);
rc = OQS_SIG_verify(sig, message, message_len, signature, signature_len, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_verify failed\n");
goto err;
}

if (extended_tests) {
rc = test_sig_bitflip(sig, message, message_len, signature, signature_len, public_key, bitflips_all, bitflips, false, NULL, 0);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
goto err;
}
Expand All @@ -139,7 +139,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
for (size_t i = 0; i < 256; ++i) {
if (((i % ctx_step == 0) && extended_tests) || i == 255) {
rc = OQS_SIG_sign_with_ctx_str(sig, signature, &signature_len, message, message_len, ctx, i, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_sign_with_ctx_str failed\n");
goto err;
Expand All @@ -148,15 +148,15 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
OQS_TEST_CT_DECLASSIFY(public_key, sig->length_public_key);
OQS_TEST_CT_DECLASSIFY(signature, signature_len);
rc = OQS_SIG_verify_with_ctx_str(sig, message, message_len, signature, signature_len, ctx, i, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_verify_with_ctx_str failed\n");
goto err;
}

if (extended_tests) {
rc = test_sig_bitflip(sig, message, message_len, signature, signature_len, public_key, bitflips_all, bitflips, true, ctx, i);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
goto err;
}
Expand All @@ -166,7 +166,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al

if (extended_tests) {
rc = OQS_SIG_sign_with_ctx_str(sig, signature, &signature_len, message, message_len, ctx, 256, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_ERROR) {
fprintf(stderr, "ERROR: OQS_SIG_sign_with_ctx_str should only support up to 255 byte contexts\n");
goto err;
Expand All @@ -182,22 +182,22 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al

if (extended_tests) {
rc = OQS_SIG_sign_with_ctx_str(sig, signature, &signature_len, message, message_len, NULL, 0, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_sign_with_ctx_str should always succeed when providing a NULL context string\n");
goto err;
}
OQS_TEST_CT_DECLASSIFY(public_key, sig->length_public_key);
OQS_TEST_CT_DECLASSIFY(signature, signature_len);
rc = OQS_SIG_verify_with_ctx_str(sig, message, message_len, signature, signature_len, NULL, 0, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_verify_with_ctx_str failed\n");
goto err;
}

rc = test_sig_bitflip(sig, message, message_len, signature, signature_len, public_key, bitflips_all, bitflips, true, NULL, 0);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
goto err;
}
Expand Down
20 changes: 10 additions & 10 deletions tests/test_sig_stfl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ OQS_STATUS sig_stfl_keypair_from_keygen(OQS_SIG_STFL *sig, uint8_t *public_key,
OQS_STATUS rc;

rc = OQS_SIG_STFL_keypair(sig, public_key, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
return OQS_ERROR;
}
Expand Down Expand Up @@ -567,7 +567,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
* Some keypair generation is fast, so we only read keypair from KATs for slow XMSS parameters
*/
rc = sig_stfl_KATs_keygen(sig, public_key, secret_key, katfile);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_STFL_keypair failed\n");
goto err;
Expand All @@ -588,7 +588,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
}

rc = OQS_SIG_STFL_sign(sig, signature, &signature_len, message, message_len, secret_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_STFL_sign failed\n");
goto err;
Expand All @@ -597,7 +597,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
OQS_TEST_CT_DECLASSIFY(public_key, sig->length_public_key);
OQS_TEST_CT_DECLASSIFY(signature, signature_len);
rc = OQS_SIG_STFL_verify(sig, message, message_len, signature, signature_len, public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: OQS_SIG_STFL_verify failed\n");
goto err;
Expand All @@ -609,13 +609,13 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
goto err;
}
rc = OQS_SIG_STFL_verify(sig, message, message_len, signature, signature_len, read_pk_buf);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: 2nd Verify with restored public key OQS_SIG_STFL_verify failed\n");
}

rc = test_sig_stfl_bitflip(sig, message, message_len, signature, signature_len, public_key, bitflips_all, bitflips);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
goto err;
}
Expand Down Expand Up @@ -836,7 +836,7 @@ static OQS_STATUS sig_stfl_test_query_key(const char *method_name) {
printf("================================================================================\n");

rc = OQS_SIG_STFL_verify(lock_test_sig_obj, message_1, message_len_1, signature_1, signature_len_1, lock_test_public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: lock thread test OQS_SIG_STFL_verify failed\n");
goto err;
Expand All @@ -847,7 +847,7 @@ static OQS_STATUS sig_stfl_test_query_key(const char *method_name) {
printf("================================================================================\n");

rc = OQS_SIG_STFL_verify(lock_test_sig_obj, message_2, message_len_2, signature_2, signature_len_2, lock_test_public_key);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: lock thread test OQS_SIG_STFL_verify failed\n");
goto err;
Expand Down Expand Up @@ -910,7 +910,7 @@ static OQS_STATUS sig_stfl_test_sig_gen(const char *method_name) {
signature_1 = OQS_MEM_malloc(lock_test_sig_obj->length_signature);

rc = OQS_SIG_STFL_sign(lock_test_sig_obj, signature_1, &signature_len_1, message_1, message_len_1, lock_test_sk);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: lock thread test OQS_SIG_STFL_sign failed\n");
goto err;
Expand Down Expand Up @@ -939,7 +939,7 @@ static OQS_STATUS sig_stfl_test_sig_gen(const char *method_name) {
signature_2 = OQS_MEM_malloc(lock_test_sig_obj->length_signature);

rc = OQS_SIG_STFL_sign(lock_test_sig_obj, signature_2, &signature_len_2, message_2, message_len_2, lock_test_sk);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof rc);
OQS_TEST_CT_DECLASSIFY(&rc, sizeof(rc));
if (rc != OQS_SUCCESS) {
fprintf(stderr, "ERROR: lock thread test OQS_SIG_STFL_sign failed\n");
goto err;
Expand Down
Loading