Re: [PATCH] crypto: sha256-mb - remove HASH_FIRST flag

[Herbert Xu]

On Wed, Jan 24, 2018 at 07:10:15PM -0800, Eric Biggers wrote:
> From: Eric Biggers 
> 
> The HASH_FIRST flag is never set.  Remove it.
> 
> Signed-off-by: Eric Biggers 

Patch applied.  Thanks.
-- 
Email: Herbert Xu 
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH] crypto: sha256-mb - remove HASH_FIRST flag

[Eric Biggers]

From: Eric Biggers 

The HASH_FIRST flag is never set.  Remove it.

Signed-off-by: Eric Biggers 
---
 arch/x86/crypto/sha256-mb/sha256_mb.c | 27 +++
 arch/x86/crypto/sha256-mb/sha256_mb_ctx.h |  8 +++-
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/arch/x86/crypto/sha256-mb/sha256_mb.c 
b/arch/x86/crypto/sha256-mb/sha256_mb.c
index 7926a226b120..4c46ac1b6653 100644
--- a/arch/x86/crypto/sha256-mb/sha256_mb.c
+++ b/arch/x86/crypto/sha256-mb/sha256_mb.c
@@ -106,14 +106,6 @@ static asmlinkage struct job_sha256* 
(*sha256_job_mgr_flush)
 static asmlinkage struct job_sha256* (*sha256_job_mgr_get_comp_job)
(struct sha256_mb_mgr *state);
 
-inline void sha256_init_digest(uint32_t *digest)
-{
-   static const uint32_t initial_digest[SHA256_DIGEST_LENGTH] = {
-   SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,
-   SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7};
-   memcpy(digest, initial_digest, sizeof(initial_digest));
-}
-
 inline uint32_t sha256_pad(uint8_t padblock[SHA256_BLOCK_SIZE * 2],
 uint64_t total_len)
 {
@@ -245,10 +237,8 @@ static struct sha256_hash_ctx 
*sha256_ctx_mgr_submit(struct sha256_ctx_mgr *mgr,
  uint32_t len,
  int flags)
 {
-   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;
return ctx;
}
@@ -259,23 +249,12 @@ static struct sha256_hash_ctx 
*sha256_ctx_mgr_submit(struct sha256_ctx_mgr *mgr,
return ctx;
}
 
-   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;
return ctx;
}
 
-   if (flags & HASH_FIRST) {
-   /* Init digest */
-   sha256_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 was no error during this call to submit */
ctx->error = HASH_CTX_ERROR_NONE;
 
diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h 
b/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h
index aabb30320af0..7c432543dc7f 100644
--- a/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h
+++ b/arch/x86/crypto/sha256-mb/sha256_mb_ctx.h
@@ -57,11 +57,9 @@
 #include "sha256_mb_mgr.h"
 
 #define HASH_UPDATE  0x00
-#define HASH_FIRST   0x01
-#define HASH_LAST0x02
-#define HASH_ENTIRE  0x03
-#define HASH_DONE   0x04
-#define HASH_FINAL  0x08
+#define HASH_LAST0x01
+#define HASH_DONE   0x02
+#define HASH_FINAL  0x04
 
 #define HASH_CTX_STS_IDLE   0x00
 #define HASH_CTX_STS_PROCESSING 0x01
-- 
2.16.0