lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 384/530] crypto: inside-secure - Change swab to swab32
    Date
    From: Peter Harliman Liem <pliem@maxlinear.com>

    [ Upstream commit 664593407e936b6438fbfaaf98876910fd31cf9a ]

    The use of swab() is causing failures in 64-bit arch, as it
    translates to __swab64() instead of the intended __swab32().
    It eventually causes wrong results in xcbcmac & cmac algo.

    Fixes: 78cf1c8bfcb8 ("crypto: inside-secure - Move ipad/opad into safexcel_context")
    Signed-off-by: Peter Harliman Liem <pliem@maxlinear.com>
    Acked-by: Antoine Tenart <atenart@kernel.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/inside-secure/safexcel_hash.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
    index bc60b5802256..2124416742f8 100644
    --- a/drivers/crypto/inside-secure/safexcel_hash.c
    +++ b/drivers/crypto/inside-secure/safexcel_hash.c
    @@ -383,7 +383,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
    u32 x;

    x = ipad[i] ^ ipad[i + 4];
    - cache[i] ^= swab(x);
    + cache[i] ^= swab32(x);
    }
    }
    cache_len = AES_BLOCK_SIZE;
    @@ -821,7 +821,7 @@ static int safexcel_ahash_final(struct ahash_request *areq)
    u32 *result = (void *)areq->result;

    /* K3 */
    - result[i] = swab(ctx->base.ipad.word[i + 4]);
    + result[i] = swab32(ctx->base.ipad.word[i + 4]);
    }
    areq->result[0] ^= 0x80; // 10- padding
    crypto_cipher_encrypt_one(ctx->kaes, areq->result, areq->result);
    @@ -2106,7 +2106,7 @@ static int safexcel_xcbcmac_setkey(struct crypto_ahash *tfm, const u8 *key,
    crypto_cipher_encrypt_one(ctx->kaes, (u8 *)key_tmp + AES_BLOCK_SIZE,
    "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3");
    for (i = 0; i < 3 * AES_BLOCK_SIZE / sizeof(u32); i++)
    - ctx->base.ipad.word[i] = swab(key_tmp[i]);
    + ctx->base.ipad.word[i] = swab32(key_tmp[i]);

    crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
    crypto_cipher_set_flags(ctx->kaes, crypto_ahash_get_flags(tfm) &
    @@ -2189,7 +2189,7 @@ static int safexcel_cmac_setkey(struct crypto_ahash *tfm, const u8 *key,
    return ret;

    for (i = 0; i < len / sizeof(u32); i++)
    - ctx->base.ipad.word[i + 8] = swab(aes.key_enc[i]);
    + ctx->base.ipad.word[i + 8] = swab32(aes.key_enc[i]);

    /* precompute the CMAC key material */
    crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 22:52    [W:3.186 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site