Skip to content

acl_hash: fix signedness conversion warnings for internal tail buffer #84

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

Merged
merged 1 commit into from
Feb 22, 2022
Merged

acl_hash: fix signedness conversion warnings for internal tail buffer #84

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
2 changes: 1 addition & 1 deletion lib/acl_hash/include/acl_hash/acl_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef struct {
uint32_t h0, h1, h2, h3, h4;
// The (len % 64) most recent bytes to be added.
// tail[0] is the earliest data byte, and so on.
char tail[64];
unsigned char tail[64];
} acl_hash_sha1_context_t;

typedef struct {
Expand Down
27 changes: 15 additions & 12 deletions lib/acl_hash/src/acl_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
//////////////////////////////
// Local functions prototypes

static void l_accum(acl_hash_sha1_context_t *c, const char *buf, size_t len);
static void l_accum_block(acl_hash_sha1_context_t *c, const char *buf);
static void l_accum(acl_hash_sha1_context_t *c, const unsigned char *buf,
size_t len);
static void l_accum_block(acl_hash_sha1_context_t *c, const unsigned char *buf);
static void l_close(acl_hash_sha1_context_t *c, char *digest_buf);
static uint32_t l_leftrotate(uint32_t v, unsigned bits);
static uint32_t l_read_bigendian_i32(const char *buf);
static uint32_t l_read_bigendian_i32(const unsigned char *buf);
static void l_write_bigendian_hex_i32(uint32_t v, char *buf);

//////////////////////////////
Expand Down Expand Up @@ -53,7 +54,7 @@ int acl_hash_add(acl_hash_context_t *ctx, const void *buf, size_t len) {
return 0;
}

l_accum(&(ctx->alg.sha1), (char *)buf, len);
l_accum(&(ctx->alg.sha1), (unsigned char *)buf, len);

return 1;
}
Expand Down Expand Up @@ -87,7 +88,8 @@ int acl_hash_hexdigest(acl_hash_context_t *ctx, char *digest_buf,
//////////////////////////////
// Local functions

static void l_accum(acl_hash_sha1_context_t *c, const char *buf, size_t len) {
static void l_accum(acl_hash_sha1_context_t *c, const unsigned char *buf,
size_t len) {
size_t buf_idx = 0;
size_t tail_idx = c->len & 63;

Expand Down Expand Up @@ -127,7 +129,8 @@ static void l_accum(acl_hash_sha1_context_t *c, const char *buf, size_t len) {
}
}

static void l_accum_block(acl_hash_sha1_context_t *ctx, const char *buf) {
static void l_accum_block(acl_hash_sha1_context_t *ctx,
const unsigned char *buf) {
unsigned i;
uint32_t w[80];
uint32_t a = ctx->h0;
Expand Down Expand Up @@ -180,7 +183,7 @@ static void l_accum_block(acl_hash_sha1_context_t *ctx, const char *buf) {
}

static void l_close(acl_hash_sha1_context_t *c, char *digest_buf) {
char extra[64];
unsigned char extra[64];
unsigned i;
unsigned raw_tail_len = (1 /* 1-byte */ + 8 /* length field */ + c->len) & 63;
unsigned num_zero_fill_bytes = raw_tail_len > 0 ? (64 - raw_tail_len) : 0;
Expand Down Expand Up @@ -217,12 +220,12 @@ static uint32_t l_leftrotate(uint32_t v, unsigned bits) {
return hi | lo;
}

static uint32_t l_read_bigendian_i32(const char *buf) {
static uint32_t l_read_bigendian_i32(const unsigned char *buf) {
// Need to cast to uchar so we don't sign extend when widening out to 32 bits.
uint32_t byte3 = (unsigned char)buf[0];
uint32_t byte2 = (unsigned char)buf[1];
uint32_t byte1 = (unsigned char)buf[2];
uint32_t byte0 = (unsigned char)buf[3];
uint32_t byte3 = buf[0];
uint32_t byte2 = buf[1];
uint32_t byte1 = buf[2];
uint32_t byte0 = buf[3];
uint32_t result = (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | (byte0);
return result;
}
Expand Down