Skip to content
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

Jump to bottom

Coverity issues #3016

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Coverity issues #3016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7309b37
unittests: Do not use uninitialized memory
xhanulik Feb 5, 2024
fd80ba7
Fix constant-time comparison of negative values
xhanulik Feb 5, 2024
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
6 changes: 6 additions & 0 deletions src/common/constant-time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,10 @@ constant_time_eq_s(size_t a, size_t b)
return constant_time_is_zero_s(a ^ b);
}

static constant_inline unsigned int
constant_time_eq_i(int a, int b)
{
return constant_time_eq((unsigned int)a, (unsigned int)b);
}

#endif /* CONSTANT_TIME_H */
4 changes: 2 additions & 2 deletions src/minidriver/minidriver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4660,7 +4660,7 @@ DWORD WINAPI CardRSADecrypt(__in PCARD_DATA pCardData,
logprintf(pCardData, 2, "sc_pkcs15_decipher: stripping PKCS1 padding\n");
r = sc_pkcs1_strip_02_padding_constant_time(vs->ctx, prkey_info->modulus_length / 8, pbuf2, pInfo->cbData, pbuf2, &temp);
pInfo->cbData = (DWORD) temp;
wrong_padding = constant_time_eq_s(r, SC_ERROR_WRONG_PADDING);
wrong_padding = constant_time_eq_i(r, SC_ERROR_WRONG_PADDING);
/* continue without returning error to not leak that padding is wrong
to prevent time side-channel leak for Marvin attack*/
}
Expand Down Expand Up @@ -4710,7 +4710,7 @@ DWORD WINAPI CardRSADecrypt(__in PCARD_DATA pCardData,
goto err;
}

good = constant_time_eq_s(r, 0);
good = constant_time_eq_i(r, 0);
/* if no error or padding error, do not return here to prevent Marvin attack */
if (!(good | wrong_padding) && r < 0) {
logprintf(pCardData, 2, "sc_pkcs15_decipher error(%i): %s\n", r, sc_strerror(r));
Expand Down
4 changes: 2 additions & 2 deletions src/pkcs11/framework-pkcs15.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4627,11 +4627,11 @@ pkcs15_prkey_decrypt(struct sc_pkcs11_session *session, void *obj,

/* only padding error must be handled in constant-time way,
* other error can be returned straight away */
if ((~constant_time_eq_s(rv, SC_ERROR_WRONG_PADDING) & constant_time_lt_s(sizeof(decrypted), rv)))
if ((~constant_time_eq_i(rv, SC_ERROR_WRONG_PADDING) & constant_time_lt_s(sizeof(decrypted), (size_t)rv)))
return sc_to_cryptoki_error(rv, "C_Decrypt");

/* check rv for padding error */
good = ~constant_time_eq_s(rv, SC_ERROR_WRONG_PADDING);
good = ~constant_time_eq_i(rv, SC_ERROR_WRONG_PADDING);
rv_pkcs11 = sc_to_cryptoki_error(SC_ERROR_WRONG_PADDING, "C_Decrypt");
rv_pkcs11 = constant_time_select_s(good, CKR_OK, rv_pkcs11);

Expand Down
22 changes: 11 additions & 11 deletions src/tests/unittests/strip_pkcs1_2_padding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ torture_long_output_buffer(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 3;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
unsigned char result_msg[] = {'m', 's', 'g'};
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, 3);
Expand All @@ -32,7 +32,7 @@ torture_short_output_buffer(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 1;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -48,7 +48,7 @@ torture_short_message_correct_padding(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 3;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
unsigned char result_msg[] = {'m', 's', 'g'};
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, 3);
Expand All @@ -66,7 +66,7 @@ torture_missing_first_zero(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 10;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -82,7 +82,7 @@ torture_missing_two(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 10;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -98,7 +98,7 @@ torture_short_padding(void **state)
0x00,
'm', 's', 'g'};
unsigned int out_len = 10;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -113,7 +113,7 @@ torture_missing_second_zero(void **state)
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
'm', 's', 'g'};
unsigned int out_len = 10;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -128,7 +128,7 @@ torture_missing_message(void **state)
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x00};
unsigned int out_len = 11;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, SC_ERROR_WRONG_PADDING);
free(out);
Expand All @@ -144,7 +144,7 @@ torture_one_byte_message(void **state)
0x00,
'm'};
unsigned int out_len = 1;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
unsigned char result_msg[] = {'m'};
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, 1);
Expand All @@ -162,7 +162,7 @@ torture_longer_padding(void **state)
0x00,
0x9d, 0x98, 0x3d, 0xca, 0xa9, 0xa7, 0x11, 0x0a};
unsigned int out_len = 8;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
unsigned char result_msg[] = {0x9d, 0x98, 0x3d, 0xca, 0xa9, 0xa7, 0x11, 0x0a};
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, 8);
Expand All @@ -179,7 +179,7 @@ torture_empty_message(void **state)
0x0e, 0x38, 0x97, 0x18, 0x16, 0x57, 0x9e, 0x30, 0xb6, 0xa5, 0x78, 0x13, 0x20, 0xca, 0x11,
0x00};
unsigned int out_len = 8;
unsigned char *out = malloc(out_len * sizeof(unsigned char));
unsigned char *out = calloc(out_len, sizeof(unsigned char));
int r = sc_pkcs1_strip_02_padding_constant_time(NULL, n, in, in_len, out, &out_len);
assert_int_equal(r, 0);
free(out);
Expand Down
Loading