| Message ID | 20151029075108.GA25880@Red (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
On Thu, 2015-10-29 at 08:51 +0100, LABBE Corentin wrote: > On Fri, Oct 16, 2015 at 09:04:58AM -0700, Tim Chen wrote: > > On Wed, 2015-10-14 at 21:15 +0200, LABBE Corentin wrote: > > > The sha x86 crypto code use two define for the same thing: > > > NUM_SHA1_DIGEST_WORDS and SHA1_DIGEST_LENGTH > > > Replace them by SHA1_DIGEST_SIZE/4 > > > > Thanks. Acked-by: Tim Chen <tim.c.chen@linux.intel.com> > > > > > > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> > > > > Hello > > Thanks for your ack, but Thomas Gleixner in the same time NACK this patch. > Just in case I attach the new patch, for permit you to decide which one you prefer. > > Regards Looks fine. But wonder if you should have #define SHA1_DIGEST_WORDS (SHA1_DIGEST_SIZE / sizeof(u32)) moved to sha1.h Tim > > diff --git a/arch/x86/crypto/sha-mb/sha_mb_ctx.h b/arch/x86/crypto/sha-mb/sha_mb_ctx.h > index e36069d..9fd36eb5 100644 > --- a/arch/x86/crypto/sha-mb/sha_mb_ctx.h > +++ b/arch/x86/crypto/sha-mb/sha_mb_ctx.h > @@ -94,7 +94,6 @@ enum hash_ctx_error { > > > /* Hash Constants and Typedefs */ > -#define SHA1_DIGEST_LENGTH 5 > #define SHA1_LOG2_BLOCK_SIZE 6 > > #define SHA1_PADLENGTHFIELD_SIZE 8 > diff --git a/arch/x86/crypto/sha-mb/sha_mb_mgr.h b/arch/x86/crypto/sha-mb/sha_mb_mgr.h > index 08ad1a9..b295e15 100644 > --- a/arch/x86/crypto/sha-mb/sha_mb_mgr.h > +++ b/arch/x86/crypto/sha-mb/sha_mb_mgr.h > @@ -54,10 +54,10 @@ > #ifndef __SHA_MB_MGR_H > #define __SHA_MB_MGR_H > > - > +#include <crypto/sha.h> > #include <linux/types.h> > > -#define NUM_SHA1_DIGEST_WORDS 5 > +#define SHA1_DIGEST_WORDS (SHA1_DIGEST_SIZE / sizeof(u32)) Suggest to move SHA1_DIGEST_WORDS to sha1.h Tim -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c index a841e97..6544ea7 100644 --- a/arch/x86/crypto/sha-mb/sha1_mb.c +++ b/arch/x86/crypto/sha-mb/sha1_mb.c @@ -104,7 +104,7 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)(struct sha1_mb_m inline void sha1_init_digest(uint32_t *digest) { - static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0, + static const uint32_t initial_digest[SHA1_DIGEST_WORDS] = {SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 }; memcpy(digest, initial_digest, sizeof(initial_digest)); } diff --git a/arch/x86/crypto/sha-mb/sha_mb_ctx.h b/arch/x86/crypto/sha-mb/sha_mb_ctx.h index e36069d..9fd36eb5 100644 --- a/arch/x86/crypto/sha-mb/sha_mb_ctx.h +++ b/arch/x86/crypto/sha-mb/sha_mb_ctx.h @@ -94,7 +94,6 @@ enum hash_ctx_error { /* Hash Constants and Typedefs */ -#define SHA1_DIGEST_LENGTH 5 #define SHA1_LOG2_BLOCK_SIZE 6 #define SHA1_PADLENGTHFIELD_SIZE 8 diff --git a/arch/x86/crypto/sha-mb/sha_mb_mgr.h b/arch/x86/crypto/sha-mb/sha_mb_mgr.h index 08ad1a9..b295e15 100644 --- a/arch/x86/crypto/sha-mb/sha_mb_mgr.h +++ b/arch/x86/crypto/sha-mb/sha_mb_mgr.h @@ -54,10 +54,10 @@ #ifndef __SHA_MB_MGR_H #define __SHA_MB_MGR_H - +#include <crypto/sha.h> #include <linux/types.h> -#define NUM_SHA1_DIGEST_WORDS 5 +#define SHA1_DIGEST_WORDS (SHA1_DIGEST_SIZE / sizeof(u32)) enum job_sts { STS_UNKNOWN = 0, STS_BEING_PROCESSED = 1, @@ -69,7 +69,7 @@ enum job_sts { STS_UNKNOWN = 0, struct job_sha1 { u8 *buffer; u32 len; - u32 result_digest[NUM_SHA1_DIGEST_WORDS] __aligned(32); + u32 result_digest[SHA1_DIGEST_WORDS] __aligned(32); enum job_sts status; void *user_data; };