Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Peter Harliman Liem <pliem@maxlinear.com>
To:     <atenart@kernel.org>, <herbert@gondor.apana.org.au>
CC:     <linux-crypto@vger.kernel.org>, <linux-lgm-soc@maxlinear.com>,
        "Peter Harliman Liem" <pliem@maxlinear.com>
Subject: [PATCH v2] crypto: inside_secure - Change swab to swab32
Date:   Tue, 6 Sep 2022 10:51:28 +0800
Message-ID: <e25e423595ead12913c9d6444438d89d85270a37.1662430815.git.pliem@maxlinear.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

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>
---
v2:
 Add fixes tag

 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,
 =09=09=09=09=09u32 x;
=20
 =09=09=09=09=09x =3D ipad[i] ^ ipad[i + 4];
-=09=09=09=09=09cache[i] ^=3D swab(x);
+=09=09=09=09=09cache[i] ^=3D swab32(x);
 =09=09=09=09}
 =09=09=09}
 =09=09=09cache_len =3D AES_BLOCK_SIZE;
@@ -821,7 +821,7 @@ static int safexcel_ahash_final(struct ahash_request *a=
req)
 =09=09=09u32 *result =3D (void *)areq->result;
=20
 =09=09=09/* K3 */
-=09=09=09result[i] =3D swab(ctx->base.ipad.word[i + 4]);
+=09=09=09result[i] =3D swab32(ctx->base.ipad.word[i + 4]);
 =09=09}
 =09=09areq->result[0] ^=3D 0x80;=09=09=09// 10- padding
 =09=09crypto_cipher_encrypt_one(ctx->kaes, areq->result, areq->result);
@@ -2106,7 +2106,7 @@ static int safexcel_xcbcmac_setkey(struct crypto_ahas=
h *tfm, const u8 *key,
 =09crypto_cipher_encrypt_one(ctx->kaes, (u8 *)key_tmp + AES_BLOCK_SIZE,
 =09=09"\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3");
 =09for (i =3D 0; i < 3 * AES_BLOCK_SIZE / sizeof(u32); i++)
-=09=09ctx->base.ipad.word[i] =3D swab(key_tmp[i]);
+=09=09ctx->base.ipad.word[i] =3D swab32(key_tmp[i]);
=20
 =09crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
 =09crypto_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,
 =09=09return ret;
=20
 =09for (i =3D 0; i < len / sizeof(u32); i++)
-=09=09ctx->base.ipad.word[i + 8] =3D swab(aes.key_enc[i]);
+=09=09ctx->base.ipad.word[i + 8] =3D swab32(aes.key_enc[i]);
=20
 =09/* precompute the CMAC key material */
 =09crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
--=20
2.17.1