|
@@ -107,15 +107,6 @@ static asmlinkage struct job_sha512* (*sha512_job_mgr_flush)
|
|
|
static asmlinkage struct job_sha512* (*sha512_job_mgr_get_comp_job)
|
|
|
(struct sha512_mb_mgr *state);
|
|
|
|
|
|
-inline void sha512_init_digest(uint64_t *digest)
|
|
|
-{
|
|
|
- static const uint64_t initial_digest[SHA512_DIGEST_LENGTH] = {
|
|
|
- SHA512_H0, SHA512_H1, SHA512_H2,
|
|
|
- SHA512_H3, SHA512_H4, SHA512_H5,
|
|
|
- SHA512_H6, SHA512_H7 };
|
|
|
- memcpy(digest, initial_digest, sizeof(initial_digest));
|
|
|
-}
|
|
|
-
|
|
|
inline uint32_t sha512_pad(uint8_t padblock[SHA512_BLOCK_SIZE * 2],
|
|
|
uint64_t total_len)
|
|
|
{
|
|
@@ -263,11 +254,8 @@ static struct sha512_hash_ctx
|
|
|
|
|
|
mgr = cstate->mgr;
|
|
|
spin_lock_irqsave(&cstate->work_lock, irqflags);
|
|
|
- if (flags & (~HASH_ENTIRE)) {
|
|
|
- /*
|
|
|
- * User should not pass anything other than FIRST, UPDATE, or
|
|
|
- * LAST
|
|
|
- */
|
|
|
+ if (flags & ~(HASH_UPDATE | HASH_LAST)) {
|
|
|
+ /* User should not pass anything other than UPDATE or LAST */
|
|
|
ctx->error = HASH_CTX_ERROR_INVALID_FLAGS;
|
|
|
goto unlock;
|
|
|
}
|
|
@@ -278,24 +266,12 @@ static struct sha512_hash_ctx
|
|
|
goto unlock;
|
|
|
}
|
|
|
|
|
|
- if ((ctx->status & HASH_CTX_STS_COMPLETE) && !(flags & HASH_FIRST)) {
|
|
|
+ if (ctx->status & HASH_CTX_STS_COMPLETE) {
|
|
|
/* Cannot update a finished job. */
|
|
|
ctx->error = HASH_CTX_ERROR_ALREADY_COMPLETED;
|
|
|
goto unlock;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- if (flags & HASH_FIRST) {
|
|
|
- /* Init digest */
|
|
|
- sha512_init_digest(ctx->job.result_digest);
|
|
|
-
|
|
|
- /* Reset byte counter */
|
|
|
- ctx->total_length = 0;
|
|
|
-
|
|
|
- /* Clear extra blocks */
|
|
|
- ctx->partial_block_buffer_length = 0;
|
|
|
- }
|
|
|
-
|
|
|
/*
|
|
|
* If we made it here, there were no errors during this call to
|
|
|
* submit
|