diff options
author | Werner Koch <wk@gnupg.org> | 2016-03-18 18:57:19 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2016-03-18 18:57:19 +0100 |
commit | 897ccd21b7221982806b5c024518f4e989152f14 (patch) | |
tree | 14eb21b32255c176e1cdfad843fe35edf0471eac /src/g10lib.h | |
parent | 9ecc2690181ba0bb44f66451a7dce2fc19965793 (diff) | |
download | libgcrypt-897ccd21b7221982806b5c024518f4e989152f14.tar.gz |
Always require a 64 bit integer type
* configure.ac (available_digests_64): Merge with available_digests.
(available_kdfs_64): Merge with available_kdfs.
<64 bit datatype test>: Bail out if no such type is available.
* src/types.h: Emit #error if no u64 can be defined.
(PROPERLY_ALIGNED_TYPE): Always add u64 type.
* cipher/bithelp.h: Remove all code paths which handle the
case of !HAVE_U64_TYPEDEF.
* cipher/bufhelp.h: Ditto.
* cipher/cipher-ccm.c: Ditto.
* cipher/cipher-gcm.c: Ditto.
* cipher/cipher-internal.h: Ditto.
* cipher/cipher.c: Ditto.
* cipher/hash-common.h: Ditto.
* cipher/md.c: Ditto.
* cipher/poly1305.c: Ditto.
* cipher/scrypt.c: Ditto.
* cipher/tiger.c: Ditto.
* src/g10lib.h: Ditto.
* tests/basic.c: Ditto.
* tests/bench-slope.c: Ditto.
* tests/benchmark.c: Ditto.
--
Given that SHA-2 and some other algorithms require a 64 bit type it
does not make anymore sense to conditionally compile some part when
the platform does not provide such a type.
GnuPG-bug-id: 1815.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'src/g10lib.h')
-rw-r--r-- | src/g10lib.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/g10lib.h b/src/g10lib.h index af688700..1070d9e9 100644 --- a/src/g10lib.h +++ b/src/g10lib.h @@ -318,13 +318,8 @@ void __gcry_burn_stack (unsigned int bytes); } while(0) #define wipememory(_ptr,_len) wipememory2(_ptr,0,_len) -#ifdef HAVE_U64_TYPEDEF - #define FASTWIPE_T u64 - #define FASTWIPE_MULT (U64_C(0x0101010101010101)) -#else - #define FASTWIPE_T u32 - #define FASTWIPE_MULT (0x01010101U) -#endif +#define FASTWIPE_T u64 +#define FASTWIPE_MULT (U64_C(0x0101010101010101)) /* Following architectures can handle unaligned accesses fast. */ #if defined(HAVE_GCC_ATTRIBUTE_PACKED) && \ |