summaryrefslogtreecommitdiff
path: root/src/types.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-03-18 18:57:19 +0100
committerWerner Koch <wk@gnupg.org>2016-03-18 18:57:19 +0100
commit897ccd21b7221982806b5c024518f4e989152f14 (patch)
tree14eb21b32255c176e1cdfad843fe35edf0471eac /src/types.h
parent9ecc2690181ba0bb44f66451a7dce2fc19965793 (diff)
downloadlibgcrypt-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/types.h')
-rw-r--r--src/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/types.h b/src/types.h
index dcdba4ff..645ddd62 100644
--- a/src/types.h
+++ b/src/types.h
@@ -123,6 +123,8 @@
typedef uint64_t u64;
# define U64_C(c) (UINT64_C(c))
# define HAVE_U64_TYPEDEF
+# else
+# error No way to declare a 64 bit integer type
# endif
#endif
@@ -132,9 +134,7 @@ typedef union
short b;
char c[1];
long d;
-#ifdef HAVE_U64_TYPEDEF
u64 e;
-#endif
float f;
double g;
} PROPERLY_ALIGNED_TYPE;