From c4c1aff23faddbf3939257f14cd7be4f0f74abb0 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 25 Nov 2013 11:43:37 +0200 Subject: [PATCH] Re: [PATCH 1/2] lib: fix byte order test in libsha1.c --- 90/8aba6d36c097e5bf9d1ea222ba9bca52ae99ed | 108 ++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 90/8aba6d36c097e5bf9d1ea222ba9bca52ae99ed diff --git a/90/8aba6d36c097e5bf9d1ea222ba9bca52ae99ed b/90/8aba6d36c097e5bf9d1ea222ba9bca52ae99ed new file mode 100644 index 000000000..1d3a85176 --- /dev/null +++ b/90/8aba6d36c097e5bf9d1ea222ba9bca52ae99ed @@ -0,0 +1,108 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 139AF431FD6 + for ; Mon, 25 Nov 2013 01:43:56 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ualoOlGisgvV for ; + Mon, 25 Nov 2013 01:43:45 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 91367431FAE + for ; Mon, 25 Nov 2013 01:43:45 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id AA6D010005E; + Mon, 25 Nov 2013 11:43:37 +0200 (EET) +From: Tomi Ollila +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [PATCH 1/2] lib: fix byte order test in libsha1.c +In-Reply-To: <1385328583-24602-1-git-send-email-david@tethera.net> +References: + <1385328583-24602-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 25 Nov 2013 09:43:56 -0000 + +On Sun, Nov 24 2013, david@tethera.net wrote: + +> From: David Bremner +> +> Previously PLATFORM_BYTE_ORDER and IS_LITTLE_ENDIAN were not defined, +> so the little endian code was always compiled in. +> +> This will have the effect that the "SHA1s" on big endian architectures +> will change (i.e. become actual sha1s). So someone re-indexing their +> database could conceivable lose tags on messages without a message-id +> header. +> --- +> lib/libsha1.c | 14 ++++++++++---- +> 1 file changed, 10 insertions(+), 4 deletions(-) +> +> diff --git a/lib/libsha1.c b/lib/libsha1.c +> index 5d16f6a..794854b 100644 +> --- a/lib/libsha1.c +> +++ b/lib/libsha1.c +> @@ -49,11 +49,17 @@ extern "C" +> +> #define bswap_32(x) ((rotr32((x), 24) & 0x00ff00ff) | (rotr32((x), 8) & 0xff00ff00)) +> +> -#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) +> -#define bsw_32(p,n) \ +> - { int _i = (n); while(_i--) ((uint32_t*)p)[_i] = bswap_32(((uint32_t*)p)[_i]); } +> +#ifdef __BYTE_ORDER__ +> +# if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +> +# define bsw_32(p,n) \ +> + { int _i = (n); while(_i--) ((uint32_t*)p)[_i] = bswap_32(((uint32_t*)p)[_i]); } +> +# elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +> +# define bsw_32(p,n) +> +# else +> +# error "unknown byte order" +> +# endif +> #else +> -#define bsw_32(p,n) +> +# error "macro __BYTE_ORDER__ is not defined" +> #endif + +LGTM. + +When you modify te NEWS entry by adding instructions how to find +out those sha1's of message-id:s that are affected (Austin's code) +You could perhaps add note of the origin of these macros +(i.e. something like +/* These "Common Predefined Macros" below are GNU C extensions */ ) + +See http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html +for reference. + +Tomi + +> +> #define SHA1_MASK (SHA1_BLOCK_SIZE - 1) +> -- +> 1.8.4.2 -- 2.26.2