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.

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

Fix input validation. #11

Merged
merged 1 commit into from
Aug 16, 2021
Merged
Changes from all commits
Commits
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: 6 additions & 6 deletions src/encoding.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <string.h>
#include <stdbool.h>

static size_t check_secret_length(size_t len) {
static int check_secret_length(size_t len) {
if(len < MIN_STRENGTH_BYTES) {
return SSKR_ERROR_SECRET_TOO_SHORT;
}
Expand All @@ -34,12 +34,12 @@ static size_t check_secret_length(size_t len) {
return 0;
}

static size_t serialize_shard(
static int serialize_shard(
const sskr_shard *shard,
uint8_t *destination,
size_t destination_len) {

if(destination_len < METADATA_LENGTH_BYTES) {
if(destination_len < METADATA_LENGTH_BYTES + shard->value_len) {
return SSKR_ERROR_INSUFFICIENT_SPACE;
}

Expand Down Expand Up @@ -105,7 +105,7 @@ static int deserialize_shard(
shard->value_len = source_len - METADATA_LENGTH_BYTES;
memcpy(shard->value, source + METADATA_LENGTH_BYTES, shard->value_len);

size_t err = check_secret_length(shard->value_len);
int err = check_secret_length(shard->value_len);
if(err) {
return err;
}
Expand Down Expand Up @@ -150,7 +150,7 @@ static int generate_shards(
void* ctx,
void (*random_generator)(uint8_t *, size_t, void*)
) {
size_t err = check_secret_length(master_secret_len);
int err = check_secret_length(master_secret_len);
if(err) {
return err;
}
Expand Down Expand Up @@ -229,7 +229,7 @@ int sskr_generate(
void* ctx,
void (*random_generator)(uint8_t *, size_t, void*)
) {
size_t err = check_secret_length(master_secret_len);
int err = check_secret_length(master_secret_len);
if(err) {
return err;
}
Expand Down