From patchwork Fri Sep 23 19:31:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 9348695 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFCB26077A for ; Fri, 23 Sep 2016 19:32:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEF582AD98 for ; Fri, 23 Sep 2016 19:32:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D13652AD9B; Fri, 23 Sep 2016 19:32:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C3B42AD98 for ; Fri, 23 Sep 2016 19:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759537AbcIWTcz (ORCPT ); Fri, 23 Sep 2016 15:32:55 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:35241 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758001AbcIWTcy (ORCPT ); Fri, 23 Sep 2016 15:32:54 -0400 Received: by mail-qk0-f171.google.com with SMTP id t7so115464282qkh.2 for ; Fri, 23 Sep 2016 12:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Fub7y1SN+1uGa1HadxuDm/rrKsxmFDrKH9i97Y4yevI=; b=T6dGX2MXbwIwxxqaO+youbXgtBcuYCbC2mXo+7j3Xs7PPXT3H6Gg50iSDqxA7ttNIS V76EGS+8/UVQWApfF1YdnSGcvHldzsOczz+Igfn4ISyB/4VQNTzojKzrxmaVocLlUryq C+SYnUaz3B/yzAhO7gfB9BDNX+69CDoKWjRWm4uYDWu/WybtWhXvVkgxvG8Cb8Nu43H9 LFGelTegdalSh1AV1aQbOo/s45HAtnMjkU6ZlVXtjGrUa6QYv2YI5hTFejoTKvW4xuAa dnioh2Tjxn8t5nX1ePOhcN/dgaXvP+0TcF6AoNB5XkHnF0yFk1CirZBcqbRaBbcJ9fxs 6aaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Fub7y1SN+1uGa1HadxuDm/rrKsxmFDrKH9i97Y4yevI=; b=eEi6ReMEmqMbaZ2qzOM15bwFtr7+mMSq73xH8KQsQCIDtp56gcav2Qe3Mebj9Q3hFM TtvjeaWzHGIBFa+hmTrxeHM5hk8uIKyg01Xkel6kmg97NUv++fWDngoNRLhMQPKtQ5PK Na/CWopQKGhM9UDp2Vhxso6aXER8YBhbEi2xMqZuEa0a1H+KvD6uO5lZ+qT3/nkxOycU dUkvW/YcJmp44lzfYx2uPE89q42GiLE++gDeVa9EBed6j6u3BjY9MuvNbb/uCRhZcacp 2B1WfdiOWCKFcf38xfXj5OME35RpFM8+TzfUgw9gQlh7Eo72WLEWePzRSkhJftVgSyGn fgmw== X-Gm-Message-State: AA6/9RntMxHWH09H6jfIDgLSF+3gFD4dWM+Zh+Sy0ZhVFDsVw/V0faStKXHdH7bWoE6D+HeP X-Received: by 10.55.11.20 with SMTP id 20mr9219736qkl.258.1474659173595; Fri, 23 Sep 2016 12:32:53 -0700 (PDT) Received: from localhost.localdomain (189-19-115-213.dsl.telesp.net.br. [189.19.115.213]) by smtp.gmail.com with ESMTPSA id e7sm4628915qtb.9.2016.09.23.12.32.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Sep 2016 12:32:52 -0700 (PDT) From: Marcelo Cerri To: Herbert Xu , "David S. Miller" Cc: linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , George Wilson , Claudio Carvalho , Paulo Flabiano Smorigo , joy.latten@canonical.com, Marcelo Cerri Subject: [PATCH] crypto: sha1-powerpc: little-endian support Date: Fri, 23 Sep 2016 16:31:56 -0300 Message-Id: <1474659116-4689-1-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver does not handle endianness properly when loading the input data. Signed-off-by: Marcelo Cerri --- arch/powerpc/crypto/sha1-powerpc-asm.S | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/crypto/sha1-powerpc-asm.S b/arch/powerpc/crypto/sha1-powerpc-asm.S index 125e165..82ddc9b 100644 --- a/arch/powerpc/crypto/sha1-powerpc-asm.S +++ b/arch/powerpc/crypto/sha1-powerpc-asm.S @@ -7,6 +7,15 @@ #include #include +#ifdef __BIG_ENDIAN__ +#define LWZ(rt, d, ra) \ + lwz rt,d(ra) +#else +#define LWZ(rt, d, ra) \ + li rt,d; \ + lwbrx rt,rt,ra +#endif + /* * We roll the registers for T, A, B, C, D, E around on each * iteration; T on iteration t is A on iteration t+1, and so on. @@ -23,7 +32,7 @@ #define W(t) (((t)%16)+16) #define LOADW(t) \ - lwz W(t),(t)*4(r4) + LWZ(W(t),(t)*4,r4) #define STEPD0_LOAD(t) \ andc r0,RD(t),RB(t); \ @@ -33,7 +42,7 @@ add r0,RE(t),r15; \ add RT(t),RT(t),r6; \ add r14,r0,W(t); \ - lwz W((t)+4),((t)+4)*4(r4); \ + LWZ(W((t)+4),((t)+4)*4,r4); \ rotlwi RB(t),RB(t),30; \ add RT(t),RT(t),r14