Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: sha-mb - Fix total_len for correct hash when larger than 512MB

Browse source 
Current multi-buffer hash implementations have a restriction on the total
length of a hash job to 512MB. Hashing larger buffers will result in an
incorrect hash. This extends the limit to 2^62 - 1.

Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>
Acked-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Greg Tucker 2016-11-14 16:11:44 -07:00 • committed by Herbert Xu
parent 75aa0a7caf
commit 7a0b86b1b9
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/crypto/sha1-mb/sha1_mb.c
View file

@ -114,7 +114,7 @@ static inline void sha1_init_digest(uint32_t *digest)
} }
static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2], static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
uint32_t total_len) uint64_t total_len)
{ {
uint32_t i = total_len & (SHA1_BLOCK_SIZE - 1); uint32_t i = total_len & (SHA1_BLOCK_SIZE - 1);

2
arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
View file

@ -125,7 +125,7 @@ struct sha1_hash_ctx {
/* error flag */ /* error flag */
int error; int error;
uint32_t total_length; uint64_t total_length;
const void *incoming_buffer; const void *incoming_buffer;
uint32_t incoming_buffer_length; uint32_t incoming_buffer_length;
uint8_t partial_block_buffer[SHA1_BLOCK_SIZE * 2]; uint8_t partial_block_buffer[SHA1_BLOCK_SIZE * 2];

2
arch/x86/crypto/sha256-mb/sha256_mb.c
View file

@ -115,7 +115,7 @@ inline void sha256_init_digest(uint32_t *digest)
} }
inline uint32_t sha256_pad(uint8_t padblock[SHA256_BLOCK_SIZE * 2], inline uint32_t sha256_pad(uint8_t padblock[SHA256_BLOCK_SIZE * 2],
uint32_t total_len) uint64_t total_len)
{ {
uint32_t i = total_len & (SHA256_BLOCK_SIZE - 1); uint32_t i = total_len & (SHA256_BLOCK_SIZE - 1);

2
arch/x86/crypto/sha256-mb/sha256_mb_ctx.h
View file

@ -125,7 +125,7 @@ struct sha256_hash_ctx {
/* error flag */ /* error flag */
int error; int error;
uint32_t total_length; uint64_t total_length;
const void *incoming_buffer; const void *incoming_buffer;
uint32_t incoming_buffer_length; uint32_t incoming_buffer_length;
uint8_t partial_block_buffer[SHA256_BLOCK_SIZE * 2]; uint8_t partial_block_buffer[SHA256_BLOCK_SIZE * 2];

2
arch/x86/crypto/sha512-mb/sha512_mb.c
View file

@ -117,7 +117,7 @@ inline void sha512_init_digest(uint64_t *digest)
} }
inline uint32_t sha512_pad(uint8_t padblock[SHA512_BLOCK_SIZE * 2], inline uint32_t sha512_pad(uint8_t padblock[SHA512_BLOCK_SIZE * 2],
uint32_t total_len) uint64_t total_len)
{ {
uint32_t i = total_len & (SHA512_BLOCK_SIZE - 1); uint32_t i = total_len & (SHA512_BLOCK_SIZE - 1);

2
arch/x86/crypto/sha512-mb/sha512_mb_ctx.h
View file

@ -119,7 +119,7 @@ struct sha512_hash_ctx {
/* error flag */ /* error flag */
int error; int error;
uint32_t total_length; uint64_t total_length;
const void *incoming_buffer; const void *incoming_buffer;
uint32_t incoming_buffer_length; uint32_t incoming_buffer_length;
uint8_t partial_block_buffer[SHA512_BLOCK_SIZE * 2]; uint8_t partial_block_buffer[SHA512_BLOCK_SIZE * 2];