From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-px0-f177.google.com ([209.85.212.177]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1Oz2H2-00028K-F2 for barebox@lists.infradead.org; Fri, 24 Sep 2010 07:00:49 +0000 Received: by pxi4 with SMTP id 4so944655pxi.36 for ; Fri, 24 Sep 2010 00:00:47 -0700 (PDT) Message-ID: <4C9C4C9A.7010504@gmail.com> Date: Fri, 24 Sep 2010 00:00:42 -0700 From: Andre MIME-Version: 1.0 References: <1285075689-11071-1-git-send-email-plagnioj@jcrosoft.com> <1285075689-11071-2-git-send-email-plagnioj@jcrosoft.com> In-Reply-To: <1285075689-11071-2-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 2/2] sha1/sha256: use be32_to_cpu and cpu_to_be32 To: Jean-Christophe PLAGNIOL-VILLARD , barebox@lists.infradead.org On 09/21/2010 06:28 AM, Jean-Christophe PLAGNIOL-VILLARD wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > lib/sha1.c | 20 +++----------------- > lib/sha256.c | 19 +++---------------- > 2 files changed, 6 insertions(+), 33 deletions(-) > > diff --git a/lib/sha1.c b/lib/sha1.c > index 0e8aed1..b4e2abc 100644 > --- a/lib/sha1.c > +++ b/lib/sha1.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > #define SHA1_SUM_POS -0x20 > #define SHA1_SUM_LEN 20 > @@ -44,23 +45,8 @@ sha1_context; > /* > * 32-bit integer manipulation macros (big endian) > */ > -#ifndef GET_UINT32_BE > -#define GET_UINT32_BE(n,b,i) { \ > - (n) = ( (uint32_t) (b)[(i) ]<< 24 ) \ > - | ( (uint32_t) (b)[(i) + 1]<< 16 ) \ > - | ( (uint32_t) (b)[(i) + 2]<< 8 ) \ > - | ( (uint32_t) (b)[(i) + 3] ); \ > -} > -#endif > - > -#ifndef PUT_UINT32_BE > -#define PUT_UINT32_BE(n,b,i) { \ > - (b)[(i) ] = (unsigned char) ( (n)>> 24 ); \ > - (b)[(i) + 1] = (unsigned char) ( (n)>> 16 ); \ > - (b)[(i) + 2] = (unsigned char) ( (n)>> 8 ); \ > - (b)[(i) + 3] = (unsigned char) ( (n) ); \ > -} > -#endif > +#define GET_UINT32_BE(n,b,i) (n) = be32_to_cpu(((uint32_t*)(b))[i / 4]) > +#define PUT_UINT32_BE(n,b,i) ((uint32_t*)(b))[i / 4] = cpu_to_be32(n) > > The previous macros served two purposes: endian swapping and performing the memory accesses byte-by-byte. New versions are unsafe for CPUs which do not support misaligned 32bit memory accesses. Andre -- _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox