Revert "Birdtest: U64_C() macro"

This reverts commit 804ee1458d33b09732eb7b883a7d77b5de74f7df.

And make better solution with stdint.h and UINT64_C macro.
Thanks to Ondrej Zajicek.

diff --git a/configure.in b/configure.in
index 5618b3a238ab128edce65b4e0b29fa80dbc06280..c81709e61bf4fec0d099306845814002b92d1e1a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -247,10 +247,6 @@ AC_TRY_COMPILE([#include <sys/types.h>
 AC_C_BIGENDIAN([AC_DEFINE(CPU_BIG_ENDIAN)], [AC_DEFINE(CPU_LITTLE_ENDIAN)],
                 [AC_MSG_ERROR([Cannot determine CPU endianity.])])
 
-AC_CHECK_SIZEOF(unsigned int)
-AC_CHECK_SIZEOF(unsigned long)
-AC_CHECK_SIZEOF(unsigned long long)
-
 BIRD_CHECK_INTEGERS
 BIRD_CHECK_STRUCT_ALIGN
 BIRD_CHECK_TIME_T

diff --git a/lib/sha512.c b/lib/sha512.c
index 88343875569fb546a1c4bbd7a6864decb862e7db..60c3ffb14328e9d82d8ca1e7300db681ff5158d9 100644 (file)
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -14,20 +14,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
+#include <stdint.h>
 
 #include "lib/sha256.h"
 #include "lib/sha256.c"        /* REMOVE ME */
 #include "lib/sha512.h"
 #include "lib/unaligned.h"
 
-#if SIZEOF_UNSIGNED_INT == 8
-  #define U64_C(c) (c ## U)
-#elif SIZEOF_UNSIGNED_LONG == 8
-  #define U64_C(c) (c ## UL)
-#elif SIZEOF_UNSIGNED_LONG_LONG == 8
-  #define U64_C(c) (c ## ULL)
-#endif
-
 static uint sha512_transform(void *context, const byte *data, size_t nblks);
 
 void
@@ -35,14 +28,14 @@ sha512_init(struct sha512_context *ctx)
 {
   struct sha512_state *hd = &ctx->state;
 
-  hd->h0 = U64_C(0x6a09e667f3bcc908);
-  hd->h1 = U64_C(0xbb67ae8584caa73b);
-  hd->h2 = U64_C(0x3c6ef372fe94f82b);
-  hd->h3 = U64_C(0xa54ff53a5f1d36f1);
-  hd->h4 = U64_C(0x510e527fade682d1);
-  hd->h5 = U64_C(0x9b05688c2b3e6c1f);
-  hd->h6 = U64_C(0x1f83d9abfb41bd6b);
-  hd->h7 = U64_C(0x5be0cd19137e2179);
+  hd->h0 = UINT64_C(0x6a09e667f3bcc908);
+  hd->h1 = UINT64_C(0xbb67ae8584caa73b);
+  hd->h2 = UINT64_C(0x3c6ef372fe94f82b);
+  hd->h3 = UINT64_C(0xa54ff53a5f1d36f1);
+  hd->h4 = UINT64_C(0x510e527fade682d1);
+  hd->h5 = UINT64_C(0x9b05688c2b3e6c1f);
+  hd->h6 = UINT64_C(0x1f83d9abfb41bd6b);
+  hd->h7 = UINT64_C(0x5be0cd19137e2179);
 
   ctx->bctx.nblocks = 0;
   ctx->bctx.nblocks_high = 0;
@@ -56,14 +49,14 @@ sha384_init(struct sha384_context *ctx)
 {
   struct sha512_state *hd = &ctx->state;
 
-  hd->h0 = U64_C(0xcbbb9d5dc1059ed8);
-  hd->h1 = U64_C(0x629a292a367cd507);
-  hd->h2 = U64_C(0x9159015a3070dd17);
-  hd->h3 = U64_C(0x152fecd8f70e5939);
-  hd->h4 = U64_C(0x67332667ffc00b31);
-  hd->h5 = U64_C(0x8eb44a8768581511);
-  hd->h6 = U64_C(0xdb0c2e0d64f98fa7);
-  hd->h7 = U64_C(0x47b5481dbefa4fa4);
+  hd->h0 = UINT64_C(0xcbbb9d5dc1059ed8);
+  hd->h1 = UINT64_C(0x629a292a367cd507);
+  hd->h2 = UINT64_C(0x9159015a3070dd17);
+  hd->h3 = UINT64_C(0x152fecd8f70e5939);
+  hd->h4 = UINT64_C(0x67332667ffc00b31);
+  hd->h5 = UINT64_C(0x8eb44a8768581511);
+  hd->h6 = UINT64_C(0xdb0c2e0d64f98fa7);
+  hd->h7 = UINT64_C(0x47b5481dbefa4fa4);
 
   ctx->bctx.nblocks = 0;
   ctx->bctx.nblocks_high = 0;
@@ -109,46 +102,46 @@ Sum1 (u64 x)
 
 static const u64 k[] =
 {
-    U64_C(0x428a2f98d728ae22), U64_C(0x7137449123ef65cd),
-    U64_C(0xb5c0fbcfec4d3b2f), U64_C(0xe9b5dba58189dbbc),
-    U64_C(0x3956c25bf348b538), U64_C(0x59f111f1b605d019),
-    U64_C(0x923f82a4af194f9b), U64_C(0xab1c5ed5da6d8118),
-    U64_C(0xd807aa98a3030242), U64_C(0x12835b0145706fbe),
-    U64_C(0x243185be4ee4b28c), U64_C(0x550c7dc3d5ffb4e2),
-    U64_C(0x72be5d74f27b896f), U64_C(0x80deb1fe3b1696b1),
-    U64_C(0x9bdc06a725c71235), U64_C(0xc19bf174cf692694),
-    U64_C(0xe49b69c19ef14ad2), U64_C(0xefbe4786384f25e3),
-    U64_C(0x0fc19dc68b8cd5b5), U64_C(0x240ca1cc77ac9c65),
-    U64_C(0x2de92c6f592b0275), U64_C(0x4a7484aa6ea6e483),
-    U64_C(0x5cb0a9dcbd41fbd4), U64_C(0x76f988da831153b5),
-    U64_C(0x983e5152ee66dfab), U64_C(0xa831c66d2db43210),
-    U64_C(0xb00327c898fb213f), U64_C(0xbf597fc7beef0ee4),
-    U64_C(0xc6e00bf33da88fc2), U64_C(0xd5a79147930aa725),
-    U64_C(0x06ca6351e003826f), U64_C(0x142929670a0e6e70),
-    U64_C(0x27b70a8546d22ffc), U64_C(0x2e1b21385c26c926),
-    U64_C(0x4d2c6dfc5ac42aed), U64_C(0x53380d139d95b3df),
-    U64_C(0x650a73548baf63de), U64_C(0x766a0abb3c77b2a8),
-    U64_C(0x81c2c92e47edaee6), U64_C(0x92722c851482353b),
-    U64_C(0xa2bfe8a14cf10364), U64_C(0xa81a664bbc423001),
-    U64_C(0xc24b8b70d0f89791), U64_C(0xc76c51a30654be30),
-    U64_C(0xd192e819d6ef5218), U64_C(0xd69906245565a910),
-    U64_C(0xf40e35855771202a), U64_C(0x106aa07032bbd1b8),
-    U64_C(0x19a4c116b8d2d0c8), U64_C(0x1e376c085141ab53),
-    U64_C(0x2748774cdf8eeb99), U64_C(0x34b0bcb5e19b48a8),
-    U64_C(0x391c0cb3c5c95a63), U64_C(0x4ed8aa4ae3418acb),
-    U64_C(0x5b9cca4f7763e373), U64_C(0x682e6ff3d6b2b8a3),
-    U64_C(0x748f82ee5defb2fc), U64_C(0x78a5636f43172f60),
-    U64_C(0x84c87814a1f0ab72), U64_C(0x8cc702081a6439ec),
-    U64_C(0x90befffa23631e28), U64_C(0xa4506cebde82bde9),
-    U64_C(0xbef9a3f7b2c67915), U64_C(0xc67178f2e372532b),
-    U64_C(0xca273eceea26619c), U64_C(0xd186b8c721c0c207),
-    U64_C(0xeada7dd6cde0eb1e), U64_C(0xf57d4f7fee6ed178),
-    U64_C(0x06f067aa72176fba), U64_C(0x0a637dc5a2c898a6),
-    U64_C(0x113f9804bef90dae), U64_C(0x1b710b35131c471b),
-    U64_C(0x28db77f523047d84), U64_C(0x32caab7b40c72493),
-    U64_C(0x3c9ebe0a15c9bebc), U64_C(0x431d67c49c100d4c),
-    U64_C(0x4cc5d4becb3e42b6), U64_C(0x597f299cfc657e2a),
-    U64_C(0x5fcb6fab3ad6faec), U64_C(0x6c44198c4a475817)
+    UINT64_C(0x428a2f98d728ae22), UINT64_C(0x7137449123ef65cd),
+    UINT64_C(0xb5c0fbcfec4d3b2f), UINT64_C(0xe9b5dba58189dbbc),
+    UINT64_C(0x3956c25bf348b538), UINT64_C(0x59f111f1b605d019),
+    UINT64_C(0x923f82a4af194f9b), UINT64_C(0xab1c5ed5da6d8118),
+    UINT64_C(0xd807aa98a3030242), UINT64_C(0x12835b0145706fbe),
+    UINT64_C(0x243185be4ee4b28c), UINT64_C(0x550c7dc3d5ffb4e2),
+    UINT64_C(0x72be5d74f27b896f), UINT64_C(0x80deb1fe3b1696b1),
+    UINT64_C(0x9bdc06a725c71235), UINT64_C(0xc19bf174cf692694),
+    UINT64_C(0xe49b69c19ef14ad2), UINT64_C(0xefbe4786384f25e3),
+    UINT64_C(0x0fc19dc68b8cd5b5), UINT64_C(0x240ca1cc77ac9c65),
+    UINT64_C(0x2de92c6f592b0275), UINT64_C(0x4a7484aa6ea6e483),
+    UINT64_C(0x5cb0a9dcbd41fbd4), UINT64_C(0x76f988da831153b5),
+    UINT64_C(0x983e5152ee66dfab), UINT64_C(0xa831c66d2db43210),
+    UINT64_C(0xb00327c898fb213f), UINT64_C(0xbf597fc7beef0ee4),
+    UINT64_C(0xc6e00bf33da88fc2), UINT64_C(0xd5a79147930aa725),
+    UINT64_C(0x06ca6351e003826f), UINT64_C(0x142929670a0e6e70),
+    UINT64_C(0x27b70a8546d22ffc), UINT64_C(0x2e1b21385c26c926),
+    UINT64_C(0x4d2c6dfc5ac42aed), UINT64_C(0x53380d139d95b3df),
+    UINT64_C(0x650a73548baf63de), UINT64_C(0x766a0abb3c77b2a8),
+    UINT64_C(0x81c2c92e47edaee6), UINT64_C(0x92722c851482353b),
+    UINT64_C(0xa2bfe8a14cf10364), UINT64_C(0xa81a664bbc423001),
+    UINT64_C(0xc24b8b70d0f89791), UINT64_C(0xc76c51a30654be30),
+    UINT64_C(0xd192e819d6ef5218), UINT64_C(0xd69906245565a910),
+    UINT64_C(0xf40e35855771202a), UINT64_C(0x106aa07032bbd1b8),
+    UINT64_C(0x19a4c116b8d2d0c8), UINT64_C(0x1e376c085141ab53),
+    UINT64_C(0x2748774cdf8eeb99), UINT64_C(0x34b0bcb5e19b48a8),
+    UINT64_C(0x391c0cb3c5c95a63), UINT64_C(0x4ed8aa4ae3418acb),
+    UINT64_C(0x5b9cca4f7763e373), UINT64_C(0x682e6ff3d6b2b8a3),
+    UINT64_C(0x748f82ee5defb2fc), UINT64_C(0x78a5636f43172f60),
+    UINT64_C(0x84c87814a1f0ab72), UINT64_C(0x8cc702081a6439ec),
+    UINT64_C(0x90befffa23631e28), UINT64_C(0xa4506cebde82bde9),
+    UINT64_C(0xbef9a3f7b2c67915), UINT64_C(0xc67178f2e372532b),
+    UINT64_C(0xca273eceea26619c), UINT64_C(0xd186b8c721c0c207),
+    UINT64_C(0xeada7dd6cde0eb1e), UINT64_C(0xf57d4f7fee6ed178),
+    UINT64_C(0x06f067aa72176fba), UINT64_C(0x0a637dc5a2c898a6),
+    UINT64_C(0x113f9804bef90dae), UINT64_C(0x1b710b35131c471b),
+    UINT64_C(0x28db77f523047d84), UINT64_C(0x32caab7b40c72493),
+    UINT64_C(0x3c9ebe0a15c9bebc), UINT64_C(0x431d67c49c100d4c),
+    UINT64_C(0x4cc5d4becb3e42b6), UINT64_C(0x597f299cfc657e2a),
+    UINT64_C(0x5fcb6fab3ad6faec), UINT64_C(0x6c44198c4a475817)
 };
 
 /*

diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in
index 2572984903419b232e9e22a072b36c8ba94ddade..a9e46e274c2f85488bf4f3b2f88295404ad139a6 100644 (file)
--- a/sysdep/autoconf.h.in
+++ b/sysdep/autoconf.h.in
@@ -66,13 +66,4 @@
 /* We have stdint.h */
 #undef HAVE_STDINT_H
 
-/* The size of `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* The size of `unsigned long long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_LONG
-
 #define CONFIG_PATH ?

diff --git a/sysdep/config.h b/sysdep/config.h
index 800118e9ea9b780beee8a810ec54910b5d4af9c5..08c15fe9a7520a3e9b16cee5c0d9ef4a8588bc32 100644 (file)
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -15,18 +15,6 @@
 /* Include OS configuration file as chosen in autoconf.h */
 #include SYSCONF_INCLUDE
 
-/* The AC_CHECK_SIZEOF() in configure fails for some machines.
- * we provide some fallback values here */
-#ifndef SIZEOF_UNSIGNED_INT
-# define SIZEOF_UNSIGNED_INT 4
-#endif
-#ifndef SIZEOF_UNSIGNED_LONG
-# define SIZEOF_UNSIGNED_LONG 4
-#endif
-#ifndef SIZEOF_UNSIGNED_LONG_LONG
-# define SIZEOF_UNSIGNED_LONG_LONG 8
-#endif
-
 #ifndef MACROS_ONLY
 
 /*