scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-25 18:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make SHA256_update and SHA512_update if the passed in length is greater than UINT32_MAX"

Browse Source 
Needed to unbreak the tegra build.

This reverts commit a01a62bf85.

R=gauravsh@chromium.org
BUG=
TEST=

Review URL: http://codereview.chromium.org/6731068

Change-Id: I096fde817c0e1cfa0c34f4f1dab986c7844c0714
This commit is contained in:
David James
2011-03-29 15:19:50 -07:00
parent a01a62bf85
commit b55193e596
2 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/lib/cryptolib/include/sha.h
View File

@@ -58,11 +58,11 @@ void SHA1_update(SHA1_CTX* ctx, const uint8_t* data, uint64_t len);
uint8_t* SHA1_final(SHA1_CTX* ctx); uint8_t* SHA1_final(SHA1_CTX* ctx);
void SHA256_init(SHA256_CTX* ctx); void SHA256_init(SHA256_CTX* ctx);
void SHA256_update(SHA256_CTX* ctx, const uint8_t* data, uint32_t len); void SHA256_update(SHA256_CTX* ctx, const uint8_t* data, uint64_t len);
uint8_t* SHA256_final(SHA256_CTX* ctx); uint8_t* SHA256_final(SHA256_CTX* ctx);
void SHA512_init(SHA512_CTX* ctx); void SHA512_init(SHA512_CTX* ctx);
void SHA512_update(SHA512_CTX* ctx, const uint8_t* data, uint32_t len); void SHA512_update(SHA512_CTX* ctx, const uint8_t* data, uint64_t len);
uint8_t* SHA512_final(SHA512_CTX* ctx); uint8_t* SHA512_final(SHA512_CTX* ctx);
/* Convenience function for SHA-1. Computes hash on [data] of length [len]. /* Convenience function for SHA-1. Computes hash on [data] of length [len].

68
firmware/lib/cryptolib/sha2.c
View File

@@ -332,22 +332,22 @@ static void SHA256_transform(SHA256_CTX* ctx, const uint8_t* message,
void SHA256_update(SHA256_CTX* ctx, const uint8_t* data, uint32_t len) { void SHA256_update(SHA256_CTX* ctx, const uint8_t* data, uint64_t len) {
unsigned int block_nb; unsigned int block_nb;
unsigned int new_len, rem_len, tmp_len; unsigned int new_len, rem_len, tmp_len;
const uint8_t *shifted_data; const uint8_t *shifted_data;
tmp_len = SHA256_BLOCK_SIZE - ctx->len; tmp_len = SHA256_BLOCK_SIZE - ctx->len;
rem_len = len < tmp_len ? len : tmp_len; rem_len = len < tmp_len ? (unsigned int)len : tmp_len;
Memcpy(&ctx->block[ctx->len], data, rem_len); Memcpy(&ctx->block[ctx->len], data, rem_len);
if (ctx->len + len < SHA256_BLOCK_SIZE) { if (ctx->len + len < SHA256_BLOCK_SIZE) {
ctx->len += len; ctx->len += (uint32_t)len;
return; return;
} }
new_len = len - rem_len; new_len = (unsigned int)len - rem_len;
block_nb = new_len / SHA256_BLOCK_SIZE; block_nb = new_len / SHA256_BLOCK_SIZE;
shifted_data = data + rem_len; shifted_data = data + rem_len;
@@ -424,7 +424,8 @@ void SHA512_init(SHA512_CTX *ctx) {
static void SHA512_transform(SHA512_CTX* ctx, const uint8_t* message, static void SHA512_transform(SHA512_CTX* ctx, const uint8_t* message,
unsigned int block_nb) { unsigned int block_nb)
{
uint64_t w[80]; uint64_t w[80];
uint64_t wv[8]; uint64_t wv[8];
uint64_t t1, t2; uint64_t t1, t2;
@@ -519,22 +520,22 @@ static void SHA512_transform(SHA512_CTX* ctx, const uint8_t* message,
void SHA512_update(SHA512_CTX* ctx, const uint8_t* data, void SHA512_update(SHA512_CTX* ctx, const uint8_t* data,
uint32_t len) { uint64_t len) {
unsigned int block_nb; unsigned int block_nb;
unsigned int new_len, rem_len, tmp_len; unsigned int new_len, rem_len, tmp_len;
const uint8_t* shifted_data; const uint8_t* shifted_data;
tmp_len = SHA512_BLOCK_SIZE - ctx->len; tmp_len = SHA512_BLOCK_SIZE - ctx->len;
rem_len = len < tmp_len ? len : tmp_len; rem_len = len < tmp_len ? (unsigned int)len : tmp_len;
Memcpy(&ctx->block[ctx->len], data, rem_len); Memcpy(&ctx->block[ctx->len], data, rem_len);
if (ctx->len + len < SHA512_BLOCK_SIZE) { if (ctx->len + len < SHA512_BLOCK_SIZE) {
ctx->len += len; ctx->len += (uint32_t)len;
return; return;
} }
new_len = len - rem_len; new_len = (unsigned int)len - rem_len;
block_nb = new_len / SHA512_BLOCK_SIZE; block_nb = new_len / SHA512_BLOCK_SIZE;
shifted_data = data + rem_len; shifted_data = data + rem_len;
@@ -592,60 +593,31 @@ uint8_t* SHA512_final(SHA512_CTX* ctx)
} }
/* Convenient functions. */
uint8_t* SHA256(const uint8_t* data, uint64_t len, uint8_t* digest) { uint8_t* SHA256(const uint8_t* data, uint64_t len, uint8_t* digest) {
const uint8_t* input_ptr; const uint8_t* p;
const uint8_t* result;
uint64_t remaining_len;
int i; int i;
SHA256_CTX ctx; SHA256_CTX ctx;
SHA256_init(&ctx); SHA256_init(&ctx);
SHA256_update(&ctx, data, len);
input_ptr = data; p = SHA256_final(&ctx);
remaining_len = len;
/* Process data in at most UINT32_MAX byte chunks at a time. */
while (remaining_len) {
uint32_t block_size;
block_size = (uint32_t) ((remaining_len >= UINT32_MAX) ?
UINT32_MAX : remaining_len);
SHA256_update(&ctx, input_ptr, block_size);
remaining_len -= block_size;
input_ptr += block_size;
}
result = SHA256_final(&ctx);
for (i = 0; i < SHA256_DIGEST_SIZE; ++i) { for (i = 0; i < SHA256_DIGEST_SIZE; ++i) {
digest[i] = *result++; digest[i] = *p++;
} }
return digest; return digest;
} }
uint8_t* SHA512(const uint8_t* data, uint64_t len, uint8_t* digest) { uint8_t* SHA512(const uint8_t* data, uint64_t len, uint8_t* digest) {
const uint8_t* input_ptr; const uint8_t* p;
const uint8_t* result;
uint64_t remaining_len;
int i; int i;
SHA512_CTX ctx; SHA512_CTX ctx;
SHA512_init(&ctx); SHA512_init(&ctx);
SHA512_update(&ctx, data, len);
input_ptr = data; p = SHA512_final(&ctx);
remaining_len = len;
/* Process data in at most UINT32_MAX byte chunks at a time. */
while (remaining_len) {
uint32_t block_size;
block_size = (uint32_t) ((remaining_len >= UINT32_MAX) ?
UINT32_MAX : remaining_len);
SHA512_update(&ctx, input_ptr, block_size);
remaining_len -= block_size;
input_ptr += block_size;
}
result = SHA512_final(&ctx);
for (i = 0; i < SHA512_DIGEST_SIZE; ++i) { for (i = 0; i < SHA512_DIGEST_SIZE; ++i) {
digest[i] = *result++; digest[i] = *p++;
} }
return digest; return digest;
} }