fix byte-order detection for gcc < v4.4.

diff --git a/libs/ardour/sha1.c b/libs/ardour/sha1.c
index 3011abc9ae75c552e703b1dc9ff33a8bcc7964ec..fab3b372eddcb952975d02d6d0f4407768c86551 100644 (file)
--- a/libs/ardour/sha1.c
+++ b/libs/ardour/sha1.c
@@ -38,7 +38,7 @@
 # endif
 #elif !defined __LITTLE_ENDIAN__
 # include <endian.h> // machine/endian.h
-# if __BYTE_ORDER__ ==  __ORDER_BIG_ENDIAN__
+# if (defined __BYTE_ORDER__ && defined __ORDER_BIG_ENDIAN__ && __BYTE_ORDER__ ==  __ORDER_BIG_ENDIAN__)
 #  define SHA_BIG_ENDIAN
 # endif
 #endif

diff --git a/libs/ardour/test/sha1_test.cc b/libs/ardour/test/sha1_test.cc
index e2b271ccb00a8b39cebb101c5eb751eb095d536f..f9e2e521d942b80cdf3966ef37dab1eb65a1c0c2 100644 (file)
--- a/libs/ardour/test/sha1_test.cc
+++ b/libs/ardour/test/sha1_test.cc
@@ -1,12 +1,10 @@
-#include <cstring>
-#include <cmath>
+#include <stdio.h>
+#include <string.h>
 #include "sha1.c"
 #include "sha1_test.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION (Sha1Test);
 
-using namespace std;
-
 void
 Sha1Test::basicTest ()
 {
@@ -17,8 +15,9 @@ Sha1Test::basicTest ()
        sha1_init (&s);
        sha1_write (&s, (const uint8_t *) "abc", 3);
        sha1_result_hash (&s, hash);
-       printf ("Expect:a9993e364706816aba3e25717850c26c9cd0d89d\n");
-       printf ("Result:%s\n", hash);
+       printf ("\nSha1: FIPS 180-2 C.1 and RFC3174 7.3 TEST1");
+       printf ("Expect: a9993e364706816aba3e25717850c26c9cd0d89d\n");
+       printf ("Result: %s\n", hash);
        CPPUNIT_ASSERT_MESSAGE ("Sha1: FIPS 180-2 C.1 and RFC3174 7.3 TEST1",
                        !strcmp ("a9993e364706816aba3e25717850c26c9cd0d89d", hash));
 
@@ -26,8 +25,9 @@ Sha1Test::basicTest ()
        sha1_init (&s);
        sha1_write (&s, (const uint8_t *) "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56);
        sha1_result_hash (&s, hash);
-       printf ("Expect:84983e441c3bd26ebaae4aa1f95129e5e54670f1\n");
-       printf ("Result:%s\n", hash);
+       printf ("\nSha1: FIPS 180-2 C.2 and RFC3174 7.3 TEST2\n");
+       printf ("Expect: 84983e441c3bd26ebaae4aa1f95129e5e54670f1\n");
+       printf ("Result: %s\n", hash);
        CPPUNIT_ASSERT_MESSAGE ("Sha1: FIPS 180-2 C.2 and RFC3174 7.3 TEST2",
                        !strcmp ("84983e441c3bd26ebaae4aa1f95129e5e54670f1", hash));
 
@@ -35,8 +35,9 @@ Sha1Test::basicTest ()
        sha1_init (&s);
        for (a = 0; a < 80; ++a) sha1_write (&s, (const uint8_t *) "01234567", 8);
        sha1_result_hash (&s, hash);
-       printf ("Expect:dea356a2cddd90c7a7ecedc5ebb563934f460452\n");
-       printf ("Result:%s\n", hash);
+       printf ("\nSha1: RFC3174 7.3 TEST4\n");
+       printf ("Expect: dea356a2cddd90c7a7ecedc5ebb563934f460452\n");
+       printf ("Result: %s\n", hash);
        CPPUNIT_ASSERT_MESSAGE ("Sha1: RFC3174 7.3 TEST4",
                        !strcmp ("dea356a2cddd90c7a7ecedc5ebb563934f460452", hash));
 
@@ -44,6 +45,7 @@ Sha1Test::basicTest ()
        sha1_init (&s);
        for (a = 0; a < 1000000; ++a) sha1_writebyte (&s, 'a');
        sha1_result_hash (&s, hash);
+       printf ("\nSha1: Sha1: FIPS 180-2 C.3 and RFC3174 7.3 TEST3\n");
        printf ("Expect:34aa973cd4c4daa4f61eeb2bdbad27316534016f\n");
        printf ("Result:%s\n", hash);
        CPPUNIT_ASSERT_MESSAGE ("Sha1: FIPS 180-2 C.3 and RFC3174 7.3 TEST3",