drivers/crypto/inside-secure/safexcel_cipher.c:457:1: warning: the frame size of 1064 bytes is larger than 1024 bytes
8:42 p.m.
Hi Pascal,
FYI, the error/warning still remains.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: ef2e9a563b0cd7965e2a1263125dcbb1c86aa6cc
commit: bb7679b840cc7cf23868e05c5ef7a044e7fafd97 crypto: inside-secure - Added support for
authenc HMAC-SHA1/DES-CBC
date: 12 months ago
config: arm-randconfig-r005-20200913 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout bb7679b840cc7cf23868e05c5ef7a044e7fafd97
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp(a)intel.com>
All warnings (new ones prefixed by >>):
drivers/crypto/inside-secure/safexcel_cipher.c: In function
'safexcel_aead_setkey':
> drivers/crypto/inside-secure/safexcel_cipher.c:457:1: warning:
the frame size of 1064 bytes is larger than 1024 bytes [-Wframe-larger-than=]
457 | }
| ^
#
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit...
git remote add linus https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
git fetch --no-tags linus master
git checkout bb7679b840cc7cf23868e05c5ef7a044e7fafd97
vim +457 drivers/crypto/inside-secure/safexcel_cipher.c
1b44c5a60c137e Antoine Tenart 2017-05-24 341
77cdd4efe57134 Pascal van Leeuwen 2019-07-05 342 static int safexcel_aead_setkey(struct
crypto_aead *ctfm, const u8 *key,
f6beaea304872b Antoine Tenart 2018-05-14 343 unsigned int len)
f6beaea304872b Antoine Tenart 2018-05-14 344 {
f6beaea304872b Antoine Tenart 2018-05-14 345 struct crypto_tfm *tfm =
crypto_aead_tfm(ctfm);
f6beaea304872b Antoine Tenart 2018-05-14 346 struct safexcel_cipher_ctx *ctx =
crypto_tfm_ctx(tfm);
f6beaea304872b Antoine Tenart 2018-05-14 347 struct safexcel_ahash_export_state
istate, ostate;
f6beaea304872b Antoine Tenart 2018-05-14 348 struct safexcel_crypto_priv *priv =
ctx->priv;
f6beaea304872b Antoine Tenart 2018-05-14 349 struct crypto_authenc_keys keys;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 350 struct crypto_aes_ctx aes;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 351 int err = -EINVAL;
f6beaea304872b Antoine Tenart 2018-05-14 352
1769f704e55b11 Pascal van Leeuwen 2019-09-13 353 if
(unlikely(crypto_authenc_extractkeys(&keys, key, len)))
f6beaea304872b Antoine Tenart 2018-05-14 354 goto badkey;
f6beaea304872b Antoine Tenart 2018-05-14 355
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 356 if (ctx->mode ==
CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD) {
1769f704e55b11 Pascal van Leeuwen 2019-09-13 357 /* Must have at least space for the
nonce here */
1769f704e55b11 Pascal van Leeuwen 2019-09-13 358 if (unlikely(keys.enckeylen <
CTR_RFC3686_NONCE_SIZE))
f6beaea304872b Antoine Tenart 2018-05-14 359 goto badkey;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 360 /* last 4 bytes of key are the nonce!
*/
f26882a3475eb7 Pascal van Leeuwen 2019-07-30 361 ctx->nonce = *(u32 *)(keys.enckey
+ keys.enckeylen -
f26882a3475eb7 Pascal van Leeuwen 2019-07-30 362 CTR_RFC3686_NONCE_SIZE);
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 363 /* exclude the nonce here */
1769f704e55b11 Pascal van Leeuwen 2019-09-13 364 keys.enckeylen -=
CTR_RFC3686_NONCE_SIZE;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 365 }
f6beaea304872b Antoine Tenart 2018-05-14 366
f6beaea304872b Antoine Tenart 2018-05-14 367 /* Encryption key */
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 368 switch (ctx->alg) {
bb7679b840cc7c Pascal van Leeuwen 2019-09-13 369 case SAFEXCEL_DES:
bb7679b840cc7c Pascal van Leeuwen 2019-09-13 370 err = verify_aead_des_key(ctfm,
keys.enckey, keys.enckeylen);
bb7679b840cc7c Pascal van Leeuwen 2019-09-13 371 if (unlikely(err))
bb7679b840cc7c Pascal van Leeuwen 2019-09-13 372 goto badkey_expflags;
bb7679b840cc7c Pascal van Leeuwen 2019-09-13 373 break;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 374 case SAFEXCEL_3DES:
21f5a15e0f26c7 Ard Biesheuvel 2019-08-15 375 err = verify_aead_des3_key(ctfm,
keys.enckey, keys.enckeylen);
77cdd4efe57134 Pascal van Leeuwen 2019-07-05 376 if (unlikely(err))
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 377 goto badkey_expflags;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 378 break;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 379 case SAFEXCEL_AES:
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 380 err = aes_expandkey(&aes,
keys.enckey, keys.enckeylen);
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 381 if (unlikely(err))
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 382 goto badkey;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 383 break;
1769f704e55b11 Pascal van Leeuwen 2019-09-13 384 case SAFEXCEL_SM4:
1769f704e55b11 Pascal van Leeuwen 2019-09-13 385 if (unlikely(keys.enckeylen !=
SM4_KEY_SIZE))
1769f704e55b11 Pascal van Leeuwen 2019-09-13 386 goto badkey;
1769f704e55b11 Pascal van Leeuwen 2019-09-13 387 break;
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 388 default:
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 389 dev_err(priv->dev, "aead:
unsupported cipher algorithm\n");
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 390 goto badkey;
77cdd4efe57134 Pascal van Leeuwen 2019-07-05 391 }
77cdd4efe57134 Pascal van Leeuwen 2019-07-05 392
53c83e915ce8b2 Antoine Tenart 2018-06-28 393 if (priv->flags &
EIP197_TRC_CACHE && ctx->base.ctxr_dma &&
f6beaea304872b Antoine Tenart 2018-05-14 394 memcmp(ctx->key, keys.enckey,
keys.enckeylen))
f6beaea304872b Antoine Tenart 2018-05-14 395 ctx->base.needs_inv = true;
f6beaea304872b Antoine Tenart 2018-05-14 396
f6beaea304872b Antoine Tenart 2018-05-14 397 /* Auth key */
a7dea8c0ff9f25 Ofer Heifetz 2018-06-28 398 switch (ctx->hash_alg) {
01ba061d0fd769 Antoine Tenart 2018-05-14 399 case CONTEXT_CONTROL_CRYPTO_ALG_SHA1:
01ba061d0fd769 Antoine Tenart 2018-05-14 400 if
(safexcel_hmac_setkey("safexcel-sha1", keys.authkey,
01ba061d0fd769 Antoine Tenart 2018-05-14 401 keys.authkeylen, &istate,
&ostate))
01ba061d0fd769 Antoine Tenart 2018-05-14 402 goto badkey;
01ba061d0fd769 Antoine Tenart 2018-05-14 403 break;
678b2878ac396f Antoine Tenart 2018-05-14 404 case
CONTEXT_CONTROL_CRYPTO_ALG_SHA224:
678b2878ac396f Antoine Tenart 2018-05-14 405 if
(safexcel_hmac_setkey("safexcel-sha224", keys.authkey,
678b2878ac396f Antoine Tenart 2018-05-14 406 keys.authkeylen, &istate,
&ostate))
678b2878ac396f Antoine Tenart 2018-05-14 407 goto badkey;
678b2878ac396f Antoine Tenart 2018-05-14 408 break;
678b2878ac396f Antoine Tenart 2018-05-14 409 case
CONTEXT_CONTROL_CRYPTO_ALG_SHA256:
f6beaea304872b Antoine Tenart 2018-05-14 410 if
(safexcel_hmac_setkey("safexcel-sha256", keys.authkey,
f6beaea304872b Antoine Tenart 2018-05-14 411 keys.authkeylen, &istate,
&ostate))
f6beaea304872b Antoine Tenart 2018-05-14 412 goto badkey;
678b2878ac396f Antoine Tenart 2018-05-14 413 break;
ea23cb533ce419 Antoine Tenart 2018-05-29 414 case
CONTEXT_CONTROL_CRYPTO_ALG_SHA384:
ea23cb533ce419 Antoine Tenart 2018-05-29 415 if
(safexcel_hmac_setkey("safexcel-sha384", keys.authkey,
ea23cb533ce419 Antoine Tenart 2018-05-29 416 keys.authkeylen, &istate,
&ostate))
ea23cb533ce419 Antoine Tenart 2018-05-29 417 goto badkey;
ea23cb533ce419 Antoine Tenart 2018-05-29 418 break;
87eee125e7490c Antoine Tenart 2018-05-29 419 case
CONTEXT_CONTROL_CRYPTO_ALG_SHA512:
87eee125e7490c Antoine Tenart 2018-05-29 420 if
(safexcel_hmac_setkey("safexcel-sha512", keys.authkey,
87eee125e7490c Antoine Tenart 2018-05-29 421 keys.authkeylen, &istate,
&ostate))
87eee125e7490c Antoine Tenart 2018-05-29 422 goto badkey;
87eee125e7490c Antoine Tenart 2018-05-29 423 break;
1769f704e55b11 Pascal van Leeuwen 2019-09-13 424 case CONTEXT_CONTROL_CRYPTO_ALG_SM3:
1769f704e55b11 Pascal van Leeuwen 2019-09-13 425 if
(safexcel_hmac_setkey("safexcel-sm3", keys.authkey,
1769f704e55b11 Pascal van Leeuwen 2019-09-13 426 keys.authkeylen, &istate,
&ostate))
1769f704e55b11 Pascal van Leeuwen 2019-09-13 427 goto badkey;
1769f704e55b11 Pascal van Leeuwen 2019-09-13 428 break;
678b2878ac396f Antoine Tenart 2018-05-14 429 default:
a60619211dd188 Pascal van Leeuwen 2019-09-18 430 dev_err(priv->dev, "aead:
unsupported hash algorithmn");
678b2878ac396f Antoine Tenart 2018-05-14 431 goto badkey;
678b2878ac396f Antoine Tenart 2018-05-14 432 }
f6beaea304872b Antoine Tenart 2018-05-14 433
f6beaea304872b Antoine Tenart 2018-05-14 434 crypto_aead_set_flags(ctfm,
crypto_aead_get_flags(ctfm) &
f6beaea304872b Antoine Tenart 2018-05-14 435 CRYPTO_TFM_RES_MASK);
f6beaea304872b Antoine Tenart 2018-05-14 436
53c83e915ce8b2 Antoine Tenart 2018-06-28 437 if (priv->flags &
EIP197_TRC_CACHE && ctx->base.ctxr_dma &&
f6beaea304872b Antoine Tenart 2018-05-14 438 (memcmp(ctx->ipad,
istate.state, ctx->state_sz) ||
f6beaea304872b Antoine Tenart 2018-05-14 439 memcmp(ctx->opad,
ostate.state, ctx->state_sz)))
f6beaea304872b Antoine Tenart 2018-05-14 440 ctx->base.needs_inv = true;
f6beaea304872b Antoine Tenart 2018-05-14 441
f6beaea304872b Antoine Tenart 2018-05-14 442 /* Now copy the keys into the context
*/
f6beaea304872b Antoine Tenart 2018-05-14 443 memcpy(ctx->key, keys.enckey,
keys.enckeylen);
f6beaea304872b Antoine Tenart 2018-05-14 444 ctx->key_len = keys.enckeylen;
f6beaea304872b Antoine Tenart 2018-05-14 445
f6beaea304872b Antoine Tenart 2018-05-14 446 memcpy(ctx->ipad,
&istate.state, ctx->state_sz);
f6beaea304872b Antoine Tenart 2018-05-14 447 memcpy(ctx->opad,
&ostate.state, ctx->state_sz);
f6beaea304872b Antoine Tenart 2018-05-14 448
f6beaea304872b Antoine Tenart 2018-05-14 449 memzero_explicit(&keys,
sizeof(keys));
f6beaea304872b Antoine Tenart 2018-05-14 450 return 0;
f6beaea304872b Antoine Tenart 2018-05-14 451
f6beaea304872b Antoine Tenart 2018-05-14 452 badkey:
f6beaea304872b Antoine Tenart 2018-05-14 453 crypto_aead_set_flags(ctfm,
CRYPTO_TFM_RES_BAD_KEY_LEN);
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 454 badkey_expflags:
f6beaea304872b Antoine Tenart 2018-05-14 455 memzero_explicit(&keys,
sizeof(keys));
0e17e3621a28a6 Pascal van Leeuwen 2019-07-05 456 return err;
f6beaea304872b Antoine Tenart 2018-05-14 @457 }
f6beaea304872b Antoine Tenart 2018-05-14 458
:::::: The code at line 457 was first introduced by commit
:::::: f6beaea304872bb1c76bf6c551386bf896cac8b9 crypto: inside-secure -
authenc(hmac(sha256), cbc(aes)) support
:::::: TO: Antoine Tenart <antoine.tenart(a)bootlin.com>
:::::: CC: Herbert Xu <herbert(a)gondor.apana.org.au>
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
2:20 p.m.
New subject: [PATCH 0/3] crypto: inside-secure - Silence stack frame size warning in safexcel_aead_setkey
On Sun, Sep 13, 2020 at 06:42:09PM +0800, kernel test robot wrote:
Hi Pascal,
FYI, the error/warning still remains.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: ef2e9a563b0cd7965e2a1263125dcbb1c86aa6cc
commit: bb7679b840cc7cf23868e05c5ef7a044e7fafd97 crypto: inside-secure - Added support
for authenc HMAC-SHA1/DES-CBC
date: 12 months ago
config: arm-randconfig-r005-20200913 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout bb7679b840cc7cf23868e05c5ef7a044e7fafd97
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp(a)intel.com>
All warnings (new ones prefixed by >>):
drivers/crypto/inside-secure/safexcel_cipher.c: In function
'safexcel_aead_setkey':
>> drivers/crypto/inside-secure/safexcel_cipher.c:457:1: warning: the frame size of
1064 bytes is larger than 1024 bytes [-Wframe-larger-than=]
457 | }
| ^
This is primarily caused by the istate/ostate variables on the
stack. This patch series removes the warning by reusing the
ahash setkey code for aead. Note that we've simply moved the
istate/ostate into the ahash code and the overall stack usage
is actually unchanged.
Cheers,
--
Email: Herbert Xu <herbert(a)gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
2:22 p.m.
New subject: [PATCH 3/3] crypto: inside-secure - Reuse code in safexcel_hmac_alg_setkey
The code in the current implementation of safexcel_hmac_alg_setkey
can be reused by safexcel_cipher. This patch does just that by
renaming the previous safexcel_hmac_setkey to __safexcel_hmac_setkey.
The now-shared safexcel_hmac_alg_setkey becomes safexcel_hmac_setkey
and a new safexcel_hmac_alg_setkey has been added for use by ahash
transforms.
As a result safexcel_aead_setkey's stack frame has been reduced by
about half in size, or about 512 bytes.
Reported-by: kernel test robot <lkp(a)intel.com>
Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au>
---
drivers/crypto/inside-secure/safexcel.h | 5 ++-
drivers/crypto/inside-secure/safexcel_cipher.c | 36 ++++++------------------
drivers/crypto/inside-secure/safexcel_hash.c | 37 +++++++++++++++----------
3 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/drivers/crypto/inside-secure/safexcel.h
b/drivers/crypto/inside-secure/safexcel.h
index dd095f6622ace..7bbb6fcec3739 100644
--- a/drivers/crypto/inside-secure/safexcel.h
+++ b/drivers/crypto/inside-secure/safexcel.h
@@ -908,8 +908,9 @@ void safexcel_rdr_req_set(struct safexcel_crypto_priv *priv,
inline struct crypto_async_request *
safexcel_rdr_req_get(struct safexcel_crypto_priv *priv, int ring);
void safexcel_inv_complete(struct crypto_async_request *req, int error);
-int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned int keylen,
- void *istate, void *ostate);
+int safexcel_hmac_setkey(struct safexcel_context *base, const u8 *key,
+ unsigned int keylen, const char *alg,
+ unsigned int state_sz);
/* available algorithms */
extern struct safexcel_alg_template safexcel_alg_ecb_des;
diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c
b/drivers/crypto/inside-secure/safexcel_cipher.c
index d0cfdbb144a3a..9bcfb79a030f1 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -404,11 +404,11 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8
*key,
{
struct crypto_tfm *tfm = crypto_aead_tfm(ctfm);
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
- struct safexcel_ahash_export_state istate, ostate;
struct safexcel_crypto_priv *priv = ctx->base.priv;
struct crypto_authenc_keys keys;
struct crypto_aes_ctx aes;
int err = -EINVAL, i;
+ const char *alg;
if (unlikely(crypto_authenc_extractkeys(&keys, key, len)))
goto badkey;
@@ -463,53 +463,37 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8
*key,
/* Auth key */
switch (ctx->hash_alg) {
case CONTEXT_CONTROL_CRYPTO_ALG_SHA1:
- if (safexcel_hmac_setkey("safexcel-sha1", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sha1";
break;
case CONTEXT_CONTROL_CRYPTO_ALG_SHA224:
- if (safexcel_hmac_setkey("safexcel-sha224", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sha224";
break;
case CONTEXT_CONTROL_CRYPTO_ALG_SHA256:
- if (safexcel_hmac_setkey("safexcel-sha256", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sha256";
break;
case CONTEXT_CONTROL_CRYPTO_ALG_SHA384:
- if (safexcel_hmac_setkey("safexcel-sha384", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sha384";
break;
case CONTEXT_CONTROL_CRYPTO_ALG_SHA512:
- if (safexcel_hmac_setkey("safexcel-sha512", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sha512";
break;
case CONTEXT_CONTROL_CRYPTO_ALG_SM3:
- if (safexcel_hmac_setkey("safexcel-sm3", keys.authkey,
- keys.authkeylen, &istate, &ostate))
- goto badkey;
+ alg = "safexcel-sm3";
break;
default:
dev_err(priv->dev, "aead: unsupported hash algorithm\n");
goto badkey;
}
- if (priv->flags & EIP197_TRC_CACHE && ctx->base.ctxr_dma &&
- (memcmp(&ctx->base.ipad, istate.state, ctx->state_sz) ||
- memcmp(&ctx->base.opad, ostate.state, ctx->state_sz)))
- ctx->base.needs_inv = true;
+ if (safexcel_hmac_setkey(&ctx->base, keys.authkey, keys.authkeylen,
+ alg, ctx->state_sz))
+ goto badkey;
/* Now copy the keys into the context */
for (i = 0; i < keys.enckeylen / sizeof(u32); i++)
ctx->key[i] = cpu_to_le32(((u32 *)keys.enckey)[i]);
ctx->key_len = keys.enckeylen;
- memcpy(&ctx->base.ipad, &istate.state, ctx->state_sz);
- memcpy(&ctx->base.opad, &ostate.state, ctx->state_sz);
-
memzero_explicit(&keys, sizeof(keys));
return 0;
diff --git a/drivers/crypto/inside-secure/safexcel_hash.c
b/drivers/crypto/inside-secure/safexcel_hash.c
index 1711ccfc5d36d..1b634889d1115 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -1138,8 +1138,9 @@ static int safexcel_hmac_init_iv(struct ahash_request *areq,
return crypto_ahash_export(areq, state);
}
-int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned int keylen,
- void *istate, void *ostate)
+static int __safexcel_hmac_setkey(const char *alg, const u8 *key,
+ unsigned int keylen,
+ void *istate, void *ostate)
{
struct ahash_request *areq;
struct crypto_ahash *tfm;
@@ -1188,30 +1189,38 @@ int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned
int keylen,
return ret;
}
-static int safexcel_hmac_alg_setkey(struct crypto_ahash *tfm, const u8 *key,
- unsigned int keylen, const char *alg,
- unsigned int state_sz)
+int safexcel_hmac_setkey(struct safexcel_context *base, const u8 *key,
+ unsigned int keylen, const char *alg,
+ unsigned int state_sz)
{
- struct safexcel_ahash_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));
- struct safexcel_crypto_priv *priv = ctx->base.priv;
+ struct safexcel_crypto_priv *priv = base->priv;
struct safexcel_ahash_export_state istate, ostate;
int ret;
- ret = safexcel_hmac_setkey(alg, key, keylen, &istate, &ostate);
+ ret = __safexcel_hmac_setkey(alg, key, keylen, &istate, &ostate);
if (ret)
return ret;
- if (priv->flags & EIP197_TRC_CACHE && ctx->base.ctxr &&
- (memcmp(&ctx->base.ipad, istate.state, state_sz) ||
- memcmp(&ctx->base.opad, ostate.state, state_sz)))
- ctx->base.needs_inv = true;
+ if (priv->flags & EIP197_TRC_CACHE && base->ctxr &&
+ (memcmp(&base->ipad, istate.state, state_sz) ||
+ memcmp(&base->opad, ostate.state, state_sz)))
+ base->needs_inv = true;
- memcpy(&ctx->base.ipad, &istate.state, state_sz);
- memcpy(&ctx->base.opad, &ostate.state, state_sz);
+ memcpy(&base->ipad, &istate.state, state_sz);
+ memcpy(&base->opad, &ostate.state, state_sz);
return 0;
}
+static int safexcel_hmac_alg_setkey(struct crypto_ahash *tfm, const u8 *key,
+ unsigned int keylen, const char *alg,
+ unsigned int state_sz)
+{
+ struct safexcel_ahash_ctx *ctx = crypto_ahash_ctx(tfm);
+
+ return safexcel_hmac_setkey(&ctx->base, key, keylen, alg, state_sz);
+}
+
static int safexcel_hmac_sha1_setkey(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen)
{
736
days inactive
737
days old
4 comments
2 participants
participants (2)
-
Herbert Xu -
kernel test robot