| Message ID | 20170519065331.27670-10-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
On 5/19/2017 1:53 AM, Corentin Labbe wrote: > This patch simply replace all occurrence of HMAC IPAD/OPAD value by their > define. > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> Acked-by: Gary R Hook <gary.hook@amd.com> > --- > drivers/crypto/ccp/ccp-crypto-sha.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c > b/drivers/crypto/ccp/ccp-crypto-sha.c > index 6b46eea94932..ce97b3868f4a 100644 > --- a/drivers/crypto/ccp/ccp-crypto-sha.c > +++ b/drivers/crypto/ccp/ccp-crypto-sha.c > @@ -18,6 +18,7 @@ > #include <linux/crypto.h> > #include <crypto/algapi.h> > #include <crypto/hash.h> > +#include <crypto/hmac.h> > #include <crypto/internal/hash.h> > #include <crypto/sha.h> > #include <crypto/scatterwalk.h> > @@ -308,8 +309,8 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, > const u8 *key, > } > > for (i = 0; i < block_size; i++) { > - ctx->u.sha.ipad[i] = ctx->u.sha.key[i] ^ 0x36; > - ctx->u.sha.opad[i] = ctx->u.sha.key[i] ^ 0x5c; > + ctx->u.sha.ipad[i] = ctx->u.sha.key[i] ^ HMAC_IPAD_VALUE; > + ctx->u.sha.opad[i] = ctx->u.sha.key[i] ^ HMAC_OPAD_VALUE; > } > > sg_init_one(&ctx->u.sha.opad_sg, ctx->u.sha.opad, block_size); > -- > 2.13.0 >
diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c index 6b46eea94932..ce97b3868f4a 100644 --- a/drivers/crypto/ccp/ccp-crypto-sha.c +++ b/drivers/crypto/ccp/ccp-crypto-sha.c @@ -18,6 +18,7 @@ #include <linux/crypto.h> #include <crypto/algapi.h> #include <crypto/hash.h> +#include <crypto/hmac.h> #include <crypto/internal/hash.h> #include <crypto/sha.h> #include <crypto/scatterwalk.h> @@ -308,8 +309,8 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, } for (i = 0; i < block_size; i++) { - ctx->u.sha.ipad[i] = ctx->u.sha.key[i] ^ 0x36; - ctx->u.sha.opad[i] = ctx->u.sha.key[i] ^ 0x5c; + ctx->u.sha.ipad[i] = ctx->u.sha.key[i] ^ HMAC_IPAD_VALUE; + ctx->u.sha.opad[i] = ctx->u.sha.key[i] ^ HMAC_OPAD_VALUE; } sg_init_one(&ctx->u.sha.opad_sg, ctx->u.sha.opad, block_size);
This patch simply replace all occurrence of HMAC IPAD/OPAD value by their define. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/crypto/ccp/ccp-crypto-sha.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)