Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1139674pxb; Wed, 10 Feb 2021 00:39:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1N761qZYsbOo4ps/O86TiHoU6R7Q7n+PhoMwUYba7voKapc448eTTYcU2VuBLNfV02Or9 X-Received: by 2002:a17:906:25c4:: with SMTP id n4mr1886557ejb.359.1612946345267; Wed, 10 Feb 2021 00:39:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612946345; cv=none; d=google.com; s=arc-20160816; b=qktnrtcyIjbQaAj5brIvQtthT5O1D1d6eK4XKbhdH4Al/crODAz7PJi0DoXefWn4Cy 2hG+ss73OxoU4P97unH+E8uN+P00TnfcvwFD7dj2FdvhgQxJKmrePQ6JA9WIUCjYLLqw X63jNppGfXK591odKIPyvZA1Y6J0ZCL/fEfQYFbUeZXYPjzR7vUjE40QwEw0wm4v1bmj z6mBXn1IQZj+3aQcyurC3JtemrrrC7XBREu/4UwqngbD2ShtwnHCJ7TjoCCr7h+oNz/P 6ZqM0I8I0PaF94F4L12bTE4MgGLJfBWUYIoujhhR0KkN5bbSyw0KqwU8fVTd4VnEgGtu pIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :message-id:subject:to:from:date; bh=BRx6/9mS296+EiE2KU65xIyt5NqDO7NrK4wK6tF/fsY=; b=SWTg6smHJfLls92y7uDSqnUtsW6PZ+KrVfLX36YgqunNyFAY0UmiIQri1/10vMt4Yo 5ygAt9pYdZt0ggNxwndxhmIBoUvjr3T9sg3rsDDMg014ZeMS72gU0SnJXwcGaQKEr/eO rx82mZJpPh7KJixD2v3oXbh6bHUJGgEKQf6Bu8JjR6XgeIzKToERZzHBTcyh2elmuXoO m0AK6vx2e+b6e/LtgA0InBreNTWvmldjrvstn7/2IxupjutLCFheAb5p4kCoq6ZExQdT GERhXtdB1kWzL51sJYT+XpWWgF5J+YormFEje+fFmYn0ZaoM/Aif6F6TnMJ6yvRyw+I7 Hd5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f10si925896edc.491.2021.02.10.00.38.42; Wed, 10 Feb 2021 00:39:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231915AbhBJHQl (ORCPT + 99 others); Wed, 10 Feb 2021 02:16:41 -0500 Received: from helcar.hmeau.com ([216.24.177.18]:50128 "EHLO fornost.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230357AbhBJHQk (ORCPT ); Wed, 10 Feb 2021 02:16:40 -0500 Received: from gwarestrin.arnor.me.apana.org.au ([192.168.103.7]) by fornost.hmeau.com with smtp (Exim 4.92 #5 (Debian)) id 1l9jjB-0001BL-61; Wed, 10 Feb 2021 18:15:58 +1100 Received: by gwarestrin.arnor.me.apana.org.au (sSMTP sendmail emulation); Wed, 10 Feb 2021 18:15:57 +1100 Date: Wed, 10 Feb 2021 18:15:57 +1100 From: Herbert Xu To: Linux Crypto Mailing List , ebiggers@kernel.org, Ard Biesheuvel Subject: [PATCH] crypto: serpent - Fix sparse byte order warnings Message-ID: <20210210071556.GA24991@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch fixes the byte order markings in serpent. Signed-off-by: Herbert Xu diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c index 236c87547a17..45f98b750053 100644 --- a/crypto/serpent_generic.c +++ b/crypto/serpent_generic.c @@ -272,6 +272,7 @@ int __serpent_setkey(struct serpent_ctx *ctx, const u8 *key, u32 *k = ctx->expkey; u8 *k8 = (u8 *)k; u32 r0, r1, r2, r3, r4; + __le32 *lk; int i; /* Copy key, add padding */ @@ -283,22 +284,32 @@ int __serpent_setkey(struct serpent_ctx *ctx, const u8 *key, while (i < SERPENT_MAX_KEY_SIZE) k8[i++] = 0; + lk = (__le32 *)k; + k[0] = le32_to_cpu(lk[0]); + k[1] = le32_to_cpu(lk[1]); + k[2] = le32_to_cpu(lk[2]); + k[3] = le32_to_cpu(lk[3]); + k[4] = le32_to_cpu(lk[4]); + k[5] = le32_to_cpu(lk[5]); + k[6] = le32_to_cpu(lk[6]); + k[7] = le32_to_cpu(lk[7]); + /* Expand key using polynomial */ - r0 = le32_to_cpu(k[3]); - r1 = le32_to_cpu(k[4]); - r2 = le32_to_cpu(k[5]); - r3 = le32_to_cpu(k[6]); - r4 = le32_to_cpu(k[7]); - - keyiter(le32_to_cpu(k[0]), r0, r4, r2, 0, 0); - keyiter(le32_to_cpu(k[1]), r1, r0, r3, 1, 1); - keyiter(le32_to_cpu(k[2]), r2, r1, r4, 2, 2); - keyiter(le32_to_cpu(k[3]), r3, r2, r0, 3, 3); - keyiter(le32_to_cpu(k[4]), r4, r3, r1, 4, 4); - keyiter(le32_to_cpu(k[5]), r0, r4, r2, 5, 5); - keyiter(le32_to_cpu(k[6]), r1, r0, r3, 6, 6); - keyiter(le32_to_cpu(k[7]), r2, r1, r4, 7, 7); + r0 = k[3]; + r1 = k[4]; + r2 = k[5]; + r3 = k[6]; + r4 = k[7]; + + keyiter(k[0], r0, r4, r2, 0, 0); + keyiter(k[1], r1, r0, r3, 1, 1); + keyiter(k[2], r2, r1, r4, 2, 2); + keyiter(k[3], r3, r2, r0, 3, 3); + keyiter(k[4], r4, r3, r1, 4, 4); + keyiter(k[5], r0, r4, r2, 5, 5); + keyiter(k[6], r1, r0, r3, 6, 6); + keyiter(k[7], r2, r1, r4, 7, 7); keyiter(k[0], r3, r2, r0, 8, 8); keyiter(k[1], r4, r3, r1, 9, 9); -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt