From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1Oz2w2-00008Y-9D for barebox@lists.infradead.org; Fri, 24 Sep 2010 07:43:11 +0000 Date: Fri, 24 Sep 2010 09:43:03 +0200 From: Sascha Hauer Message-ID: <20100924074303.GO23406@pengutronix.de> References: <1285075689-11071-1-git-send-email-plagnioj@jcrosoft.com> <1285075689-11071-2-git-send-email-plagnioj@jcrosoft.com> <4C9C4C9A.7010504@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4C9C4C9A.7010504@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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: Andre Cc: barebox@lists.infradead.org On Fri, Sep 24, 2010 at 12:00:42AM -0700, Andre wrote: > 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. Indeed. We have get_unaligned_be32() / put_unaligned_be32(). These should be the correct functions, right? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox