diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-05 14:46:34 +0000 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-11 13:17:33 -0700 | 
| commit | ec7381fbf6f77cc465eb06a1ab6f8a99df1e487c (patch) | |
| tree | d352d38e00ee2cc7d404daa88842435df53a97d9 /lib/sha256.c | |
| parent | a7d1d765793a05c0d6f7547122339dbecc94f6c3 (diff) | |
| download | olio-uboot-2014.01-ec7381fbf6f77cc465eb06a1ab6f8a99df1e487c.tar.xz olio-uboot-2014.01-ec7381fbf6f77cc465eb06a1ab6f8a99df1e487c.zip | |
sha256: Use const where possible and add watchdog function
In preparation for making the hash function common, we may as well use
const where we can.
Also add a watchdog version of the hashing function.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/sha256.c')
| -rw-r--r-- | lib/sha256.c | 37 | 
1 files changed, 35 insertions, 2 deletions
| diff --git a/lib/sha256.c b/lib/sha256.c index deb63a40b..ab2db4890 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -60,7 +60,7 @@ void sha256_starts(sha256_context * ctx)  	ctx->state[7] = 0x5BE0CD19;  } -void sha256_process(sha256_context * ctx, uint8_t data[64]) +static void sha256_process(sha256_context *ctx, const uint8_t data[64])  {  	uint32_t temp1, temp2;  	uint32_t W[64]; @@ -191,7 +191,7 @@ void sha256_process(sha256_context * ctx, uint8_t data[64])  	ctx->state[7] += H;  } -void sha256_update(sha256_context * ctx, uint8_t * input, uint32_t length) +void sha256_update(sha256_context *ctx, const uint8_t *input, uint32_t length)  {  	uint32_t left, fill; @@ -260,3 +260,36 @@ void sha256_finish(sha256_context * ctx, uint8_t digest[32])  	PUT_UINT32_BE(ctx->state[6], digest, 24);  	PUT_UINT32_BE(ctx->state[7], digest, 28);  } + +/* + * Output = SHA-256( input buffer ). Trigger the watchdog every 'chunk_sz' + * bytes of input processed. + */ +void sha256_csum_wd(const unsigned char *input, unsigned int ilen, +		unsigned char *output, unsigned int chunk_sz) +{ +	sha256_context ctx; +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) +	unsigned char *end, *curr; +	int chunk; +#endif + +	sha256_starts(&ctx); + +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) +	curr = input; +	end = input + ilen; +	while (curr < end) { +		chunk = end - curr; +		if (chunk > chunk_sz) +			chunk = chunk_sz; +		sha256_update(&ctx, curr, chunk); +		curr += chunk; +		WATCHDOG_RESET(); +	} +#else +	sha256_update(&ctx, input, ilen); +#endif + +	sha256_finish(&ctx, output); +} |