Patchwork crypto: sha1-mb - remove HASH_FIRST flag

login
register
mail settings
Submitter Eric Biggers
Date Jan. 25, 2018, 3:10 a.m.
Message ID <20180125031008.778-1-ebiggers3@gmail.com>
Download mbox | patch
Permalink /patch/10183529/
State Accepted
Delegated to: Herbert Xu
Headers show

Comments

Eric Biggers - Jan. 25, 2018, 3:10 a.m.
From: Eric Biggers <ebiggers@google.com>

The HASH_FIRST flag is never set.  Remove it.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 arch/x86/crypto/sha1-mb/sha1_mb.c     | 28 +++-------------------------
 arch/x86/crypto/sha1-mb/sha1_mb_ctx.h |  8 +++-----
 2 files changed, 6 insertions(+), 30 deletions(-)
tim - Jan. 25, 2018, 9:58 p.m.
On 01/24/2018 07:10 PM, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The HASH_FIRST flag is never set.  Remove it.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  arch/x86/crypto/sha1-mb/sha1_mb.c     | 28 +++-------------------------
>  arch/x86/crypto/sha1-mb/sha1_mb_ctx.h |  8 +++-----
>  2 files changed, 6 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
> index acf9fdf01671..e17655ffde79 100644
> --- a/arch/x86/crypto/sha1-mb/sha1_mb.c
> +++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
> @@ -106,13 +106,6 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
>  static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
>  						(struct sha1_mb_mgr *state);
>  
> -static inline void sha1_init_digest(uint32_t *digest)
> -{
> -	static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
> -					SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
> -	memcpy(digest, initial_digest, sizeof(initial_digest));
> -}
> -
>  static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
>  			 uint64_t total_len)
>  {
> @@ -244,11 +237,8 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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,24 +249,12 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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 */
> -		sha1_init_digest(ctx->job.result_digest);
> -
> -		/* Reset byte counter */
> -		ctx->total_length = 0;
> -
> -		/* Clear extra blocks */
> -		ctx->partial_block_buffer_length = 0;
> -	}
> -

I suppose this will be okay as we are really doing the initialization in
sha1_mb_init.  Megha is now maintaining this code.  Copying her
so she can do some verification of this change.

Tim

>  	/*
>  	 * If we made it here, there were no errors during this call to
>  	 * submit
> diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> index 13590ccf965c..9454bd16f9f8 100644
> --- a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> +++ b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> @@ -57,11 +57,9 @@
>  #include "sha1_mb_mgr.h"
>  
>  #define HASH_UPDATE          0x00
> -#define HASH_FIRST           0x01
> -#define HASH_LAST            0x02
> -#define HASH_ENTIRE          0x03
> -#define HASH_DONE	     0x04
> -#define HASH_FINAL	     0x08
> +#define HASH_LAST            0x01


> +#define HASH_DONE	     0x02
> +#define HASH_FINAL	     0x04
>  
>  #define HASH_CTX_STS_IDLE       0x00
>  #define HASH_CTX_STS_PROCESSING 0x01
>
Eric Biggers - Jan. 25, 2018, 10:03 p.m.
On Thu, Jan 25, 2018 at 01:58:38PM -0800, Tim Chen wrote:
> On 01/24/2018 07:10 PM, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> > 
> > The HASH_FIRST flag is never set.  Remove it.
> > 
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> >  arch/x86/crypto/sha1-mb/sha1_mb.c     | 28 +++-------------------------
> >  arch/x86/crypto/sha1-mb/sha1_mb_ctx.h |  8 +++-----
> >  2 files changed, 6 insertions(+), 30 deletions(-)
> > 
> > diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
> > index acf9fdf01671..e17655ffde79 100644
> > --- a/arch/x86/crypto/sha1-mb/sha1_mb.c
> > +++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
> > @@ -106,13 +106,6 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
> >  static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
> >  						(struct sha1_mb_mgr *state);
> >  
> > -static inline void sha1_init_digest(uint32_t *digest)
> > -{
> > -	static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
> > -					SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
> > -	memcpy(digest, initial_digest, sizeof(initial_digest));
> > -}
> > -
> >  static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
> >  			 uint64_t total_len)
> >  {
> > @@ -244,11 +237,8 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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,24 +249,12 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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 */
> > -		sha1_init_digest(ctx->job.result_digest);
> > -
> > -		/* Reset byte counter */
> > -		ctx->total_length = 0;
> > -
> > -		/* Clear extra blocks */
> > -		ctx->partial_block_buffer_length = 0;
> > -	}
> > -
> 
> I suppose this will be okay as we are really doing the initialization in
> sha1_mb_init.  Megha is now maintaining this code.  Copying her
> so she can do some verification of this change.
> 

Please update the MAINTAINERS file so that people know who to Cc on patches.

Eric
Herbert Xu - Feb. 15, 2018, 3:42 p.m.
On Wed, Jan 24, 2018 at 07:10:08PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The HASH_FIRST flag is never set.  Remove it.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Patch applied.  Thanks.

Patch

diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
index acf9fdf01671..e17655ffde79 100644
--- a/arch/x86/crypto/sha1-mb/sha1_mb.c
+++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
@@ -106,13 +106,6 @@  static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
 static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
 						(struct sha1_mb_mgr *state);
 
-static inline void sha1_init_digest(uint32_t *digest)
-{
-	static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
-					SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
-	memcpy(digest, initial_digest, sizeof(initial_digest));
-}
-
 static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
 			 uint64_t total_len)
 {
@@ -244,11 +237,8 @@  static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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,24 +249,12 @@  static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_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 */
-		sha1_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
diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
index 13590ccf965c..9454bd16f9f8 100644
--- a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
+++ b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
@@ -57,11 +57,9 @@ 
 #include "sha1_mb_mgr.h"
 
 #define HASH_UPDATE          0x00
-#define HASH_FIRST           0x01
-#define HASH_LAST            0x02
-#define HASH_ENTIRE          0x03
-#define HASH_DONE	     0x04
-#define HASH_FINAL	     0x08
+#define HASH_LAST            0x01
+#define HASH_DONE	     0x02
+#define HASH_FINAL	     0x04
 
 #define HASH_CTX_STS_IDLE       0x00
 #define HASH_CTX_STS_PROCESSING 0x01