upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-03 05:50:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2453-sha2-c-warning-argument-with-mismatched-bound' into 'v9_11'

Browse source 
Fix arguments with mismatched bound in lib/isc/sha2.c

See merge request isc-projects/bind9!5038
This commit is contained in:
Michal Nowak 2021-05-20 11:34:20 +00:00
commit ed85a2f866
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/isc/sha2.c
View file

@ -885,7 +885,7 @@ isc_sha224_update(isc_sha224_t *context, const uint8_t* data, size_t len) {
}
void
isc_sha224_final(uint8_t digest[], isc_sha224_t *context) {
isc_sha224_final(uint8_t digest[ISC_SHA224_DIGESTLENGTH], isc_sha224_t *context) {
uint8_t sha256_digest[ISC_SHA256_DIGESTLENGTH];
isc_sha256_final(sha256_digest, (isc_sha256_t *)context);
memmove(digest, sha256_digest, ISC_SHA224_DIGESTLENGTH);
@ -1148,7 +1148,7 @@ isc_sha256_update(isc_sha256_t *context, const uint8_t *data, size_t len) {
}
void
isc_sha256_final(uint8_t digest[], isc_sha256_t *context) {
isc_sha256_final(uint8_t digest[ISC_SHA256_DIGESTLENGTH], isc_sha256_t *context) {
uint32_t *d = (uint32_t*)digest;
unsigned int usedspace;
@ -1511,7 +1511,7 @@ void isc_sha512_last(isc_sha512_t *context) {
isc_sha512_transform(context, (uint64_t*)context->buffer);
}
void isc_sha512_final(uint8_t digest[], isc_sha512_t *context) {
void isc_sha512_final(uint8_t digest[ISC_SHA512_DIGESTLENGTH], isc_sha512_t *context) {
uint64_t *d = (uint64_t*)digest;
/* Sanity check: */
@ -1564,7 +1564,7 @@ isc_sha384_update(isc_sha384_t *context, const uint8_t* data, size_t len) {
}
void
isc_sha384_final(uint8_t digest[], isc_sha384_t *context) {
isc_sha384_final(uint8_t digest[ISC_SHA384_DIGESTLENGTH], isc_sha384_t *context) {
uint64_t *d = (uint64_t*)digest;
/* Sanity check: */
@ -1601,7 +1601,7 @@ isc_sha384_final(uint8_t digest[], isc_sha384_t *context) {
static const char *sha2_hex_digits = "0123456789abcdef";
char *
isc_sha224_end(isc_sha224_t *context, char buffer[]) {
isc_sha224_end(isc_sha224_t *context, char buffer[ISC_SHA224_DIGESTSTRINGLENGTH]) {
uint8_t digest[ISC_SHA224_DIGESTLENGTH], *d = digest;
unsigned int i;
@ -1642,7 +1642,7 @@ isc_sha224_data(const uint8_t *data, size_t len,
}
char *
isc_sha256_end(isc_sha256_t *context, char buffer[]) {
isc_sha256_end(isc_sha256_t *context, char buffer[ISC_SHA256_DIGESTSTRINGLENGTH]) {
uint8_t digest[ISC_SHA256_DIGESTLENGTH], *d = digest;
unsigned int i;
@ -1683,7 +1683,7 @@ isc_sha256_data(const uint8_t* data, size_t len,
}
char *
isc_sha512_end(isc_sha512_t *context, char buffer[]) {
isc_sha512_end(isc_sha512_t *context, char buffer[ISC_SHA512_DIGESTSTRINGLENGTH]) {
uint8_t digest[ISC_SHA512_DIGESTLENGTH], *d = digest;
unsigned int i;
@ -1724,7 +1724,7 @@ isc_sha512_data(const uint8_t *data, size_t len,
}
char *
isc_sha384_end(isc_sha384_t *context, char buffer[]) {
isc_sha384_end(isc_sha384_t *context, char buffer[ISC_SHA384_DIGESTSTRINGLENGTH]) {
uint8_t digest[ISC_SHA384_DIGESTLENGTH], *d = digest;
unsigned int i;