Patchwork [U-Boot,v2] crc32: Correct endianness of crc32 result

login
register
mail settings
Submitter Simon Glass
Date April 18, 2013, 8:25 p.m.
Message ID <1366316751-22465-1-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/237733/
State Accepted, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - April 18, 2013, 8:25 p.m.
When crc32 is handled by the hash library, it requires the data to be in
big-endian format, since it reads it byte-wise. Thus at present the 'crc32'
command reports incorrect data. For example, previously we might see:

Peach # crc32 40000000 100
CRC32 for 40000000 ... 400000ff ==> 0d968558

but instead with the hash library we see:

Peach # crc32 40000000 100
CRC32 for 40000000 ... 400000ff ==> 5885960d

Correct this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@google.com>
---
Changes in v2:
- Remove use of put_unaligned_be32()
- Use htonl() instead of htobe32()

 lib/crc32.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Tom Rini - April 19, 2013, 2:25 p.m.
On Thu, Apr 18, 2013 at 01:25:51PM -0700, Simon Glass wrote:

> When crc32 is handled by the hash library, it requires the data to be in
> big-endian format, since it reads it byte-wise. Thus at present the 'crc32'
> command reports incorrect data. For example, previously we might see:
> 
> Peach # crc32 40000000 100
> CRC32 for 40000000 ... 400000ff ==> 0d968558
> 
> but instead with the hash library we see:
> 
> Peach # crc32 40000000 100
> CRC32 for 40000000 ... 400000ff ==> 5885960d
> 
> Correct this.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Vadim Bendebury <vbendeb@google.com>
> ---
> Changes in v2:
> - Remove use of put_unaligned_be32()
> - Use htonl() instead of htobe32()
> 
>  lib/crc32.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/crc32.c b/lib/crc32.c
> index 76205da..9759212 100644
> --- a/lib/crc32.c
> +++ b/lib/crc32.c
> @@ -8,7 +8,9 @@
>   * For conditions of distribution and use, see copyright notice in zlib.h
>   */
>  
> -#ifndef USE_HOSTCC
> +#ifdef USE_HOSTCC
> +#include <arpa/inet.h>
> +#else
>  #include <common.h>
>  #endif
>  #include <compiler.h>
> @@ -256,5 +258,6 @@ void crc32_wd_buf(const unsigned char *input, unsigned int ilen,
>  	uint32_t crc;
>  
>  	crc = crc32_wd(0, input, ilen, chunk_sz);
> +	crc = htonl(crc);
>  	memcpy(output, &crc, sizeof(crc));
>  }

Applied to u-boot/master, thanks!

Patch

diff --git a/lib/crc32.c b/lib/crc32.c
index 76205da..9759212 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -8,7 +8,9 @@ 
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#ifndef USE_HOSTCC
+#ifdef USE_HOSTCC
+#include <arpa/inet.h>
+#else
 #include <common.h>
 #endif
 #include <compiler.h>
@@ -256,5 +258,6 @@  void crc32_wd_buf(const unsigned char *input, unsigned int ilen,
 	uint32_t crc;
 
 	crc = crc32_wd(0, input, ilen, chunk_sz);
+	crc = htonl(crc);
 	memcpy(output, &crc, sizeof(crc));
 }