diff --git a/libselinux/src/label_internal.h b/libselinux/src/label_internal.h index 82a762f7c8..782c6aa8cc 100644 --- a/libselinux/src/label_internal.h +++ b/libselinux/src/label_internal.h @@ -57,7 +57,7 @@ int selabel_service_init(struct selabel_handle *rec, struct selabel_digest { unsigned char *digest; /* SHA1 digest of specfiles */ unsigned char *hashbuf; /* buffer to hold specfiles */ - uint32_t hashbuf_size; /* buffer size */ + size_t hashbuf_size; /* buffer size */ size_t specfile_cnt; /* how many specfiles processed */ char **specfile_list; /* and their names */ }; diff --git a/libselinux/src/label_support.c b/libselinux/src/label_support.c index 94ed6e4273..09909590d6 100644 --- a/libselinux/src/label_support.c +++ b/libselinux/src/label_support.c @@ -116,13 +116,25 @@ int read_spec_entries(char *line_buf, const char **errbuf, int num_args, ...) void digest_gen_hash(struct selabel_digest *digest) { Sha1Context context; + size_t update_len; + const unsigned char *ptr; /* If SELABEL_OPT_DIGEST not set then just return */ if (!digest) return; Sha1Initialise(&context); - Sha1Update(&context, digest->hashbuf, digest->hashbuf_size); + + /* Process in blocks of UINT32_MAX bytes */ + update_len = digest->hashbuf_size; + ptr = digest->hashbuf; + while (update_len > UINT32_MAX) { + Sha1Update(&context, ptr, UINT32_MAX); + update_len -= UINT32_MAX; + ptr += UINT32_MAX; + } + Sha1Update(&context, ptr, update_len); + Sha1Finalise(&context, (SHA1_HASH *)digest->digest); free(digest->hashbuf); digest->hashbuf = NULL;