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

Resolve compiler warnings #597

Merged
merged 3 commits into from
Mar 5, 2020
Merged

Resolve compiler warnings #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4cb8bd
Suppress false positive warning
ilammy Feb 29, 2020
adcbe1b
Do not "fix up" iterator ordering
ilammy Feb 29, 2020
38e504c
Initialize structs with memset() manually
ilammy Feb 29, 2020
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
12 changes: 8 additions & 4 deletions src/themis/secure_cell_seal_passphrase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ static themis_status_t themis_auth_sym_derive_encryption_key_pbkdf2(
{
themis_status_t res = THEMIS_FAIL;
uint8_t salt[THEMIS_AUTH_SYM_PBKDF2_SALT_LENGTH] = {0};
struct themis_scell_pbkdf2_context kdf = {0};
struct themis_scell_pbkdf2_context kdf;

memset(&kdf, 0, sizeof(kdf));
kdf.iteration_count = THEMIS_AUTH_SYM_PBKDF2_ITERATIONS;
kdf.salt = salt;
kdf.salt_length = sizeof(salt);
Expand Down Expand Up @@ -169,13 +170,14 @@ themis_status_t themis_auth_sym_encrypt_message_with_passphrase_(const uint8_t*
uint8_t auth_tag[THEMIS_AUTH_SYM_AUTH_TAG_LENGTH] = {0};
uint8_t derived_key[THEMIS_AUTH_SYM_KEY_LENGTH / 8] = {0};
size_t derived_key_length = sizeof(derived_key);
struct themis_scell_auth_token_passphrase hdr = {0};
struct themis_scell_auth_token_passphrase hdr;

/* Message length is currently stored as 32-bit integer, sorry */
if (message_length > UINT32_MAX) {
return THEMIS_INVALID_PARAMETER;
}

memset(&hdr, 0, sizeof(hdr));
hdr.alg = THEMIS_AUTH_SYM_PASSPHRASE_ALG;
hdr.iv = iv;
hdr.iv_length = sizeof(iv);
Expand Down Expand Up @@ -283,8 +285,9 @@ static themis_status_t themis_auth_sym_derive_decryption_key_pbkdf2(
size_t derived_key_length)
{
themis_status_t res = THEMIS_FAIL;
struct themis_scell_pbkdf2_context kdf = {0};
struct themis_scell_pbkdf2_context kdf;

memset(&kdf, 0, sizeof(kdf));
res = themis_read_scell_pbkdf2_context(hdr, &kdf);
if (res != THEMIS_SUCCESS) {
return res;
Expand Down Expand Up @@ -343,11 +346,12 @@ themis_status_t themis_auth_sym_decrypt_message_with_passphrase_(const uint8_t*
size_t* message_length)
{
themis_status_t res = THEMIS_FAIL;
struct themis_scell_auth_token_passphrase hdr = {0};
struct themis_scell_auth_token_passphrase hdr;
/* Use maximum possible length, not the default one */
uint8_t derived_key[THEMIS_AUTH_SYM_MAX_KEY_LENGTH / 8] = {0};
size_t derived_key_length = sizeof(derived_key);

memset(&hdr, 0, sizeof(hdr));
res = themis_read_scell_auth_token_passphrase(auth_token, auth_token_length, &hdr);
if (res != THEMIS_SUCCESS) {
return res;
Expand Down
5 changes: 1 addition & 4 deletions src/wrappers/themis/themispp/impl/input_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,10 @@ inline input_buffer input_bytes(Iterator begin, Iterator end) noexcept
// are indeed contiguous, so we trust the application code with that.
// The behavior is undefined (i.e., we'll crash) if memory between
// begin and end is not addressable.
if (begin < end) {
return input_buffer(&*begin, end - begin);
}
if (begin == end) {
return input_buffer();
}
return input_buffer(&*end, begin - end);
return input_buffer(&*begin, end - begin);
}

// STL-compatible contiguous containers
Expand Down
4 changes: 0 additions & 4 deletions tests/themispp/input_buffer_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ static inline void input_buffer_bytes()
std::vector<uint8_t> vector(5, 0);
themispp::impl::input_buffer buf1 = themispp::impl::input_bytes(vector.begin(), vector.end());
sput_fail_unless(buf1.data() == &vector[0] && buf1.size() == 5, "std::vector (iterators)", __LINE__);
themispp::impl::input_buffer buf2 = themispp::impl::input_bytes(vector.end(), vector.begin());
sput_fail_unless(buf2.data() == &vector[0] && buf2.size() == 5,
"std::vector (iterators, flip)",
__LINE__);
}
{
uint8_t array[] = {1, 2, 3}; // NOLINT(cppcoreguidelines-avoid-c-arrays)
Expand Down
5 changes: 5 additions & 0 deletions tests/themispp/secret_bytes_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,15 @@ static inline void test_secret_bytes()
other_vector.push_back(9);
secret_bytes move_vector(std::move(other_vector));
sput_fail_unless(move_vector.size() == 2, "move std::vector", __LINE__);
// GCC says "potential null pointer dereference" but that's false positive:
// "move_vector.data()" is never null because "move_vector.size() == 2".
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnull-dereference"
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
sput_fail_unless(move_vector.data()[0] == 8 && move_vector.data()[1] == 9,
"move std::vector: data",
__LINE__);
#pragma GCC diagnostic pop
// NOLINTNEXTLINE(bugprone-use-after-move)
sput_fail_unless(other_vector.empty(), "move std::vector: moved", __LINE__);
#endif
Expand Down