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 /cipher/bufhelp.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 'cipher/bufhelp.h')
-rw-r--r-- | cipher/bufhelp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cipher/bufhelp.h b/cipher/bufhelp.h index aec4f1cb..df355947 100644 --- a/cipher/bufhelp.h +++ b/cipher/bufhelp.h @@ -318,7 +318,7 @@ static inline void buf_put_le32(void *_buf, u32 val) out[0] = val; } -#ifdef HAVE_U64_TYPEDEF + /* Functions for loading and storing unaligned u64 values of different endianness. */ static inline u64 buf_get_be64(const void *_buf) @@ -364,7 +364,6 @@ static inline void buf_put_le64(void *_buf, u64 val) out[1] = val >> 8; out[0] = val; } -#endif /*HAVE_U64_TYPEDEF*/ #else /*BUFHELP_FAST_UNALIGNED_ACCESS*/ @@ -397,7 +396,6 @@ static inline void buf_put_le32(void *_buf, u32 val) out->a = le_bswap32(val); } -#ifdef HAVE_U64_TYPEDEF typedef struct bufhelp_u64_s { @@ -427,7 +425,7 @@ static inline void buf_put_le64(void *_buf, u64 val) bufhelp_u64_t *out = _buf; out->a = le_bswap64(val); } -#endif /*HAVE_U64_TYPEDEF*/ + #endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/ |