smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 20:56:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Robin Gareus 2015-08-03 15:16:29 +02:00
parent 469ead78f7
commit 30dc3b871c
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/sha1.c
View file

@ -38,7 +38,7 @@
# endif # endif
#elif !defined __LITTLE_ENDIAN__ #elif !defined __LITTLE_ENDIAN__
# include <endian.h> // machine/endian.h # 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 # define SHA_BIG_ENDIAN
# endif # endif
#endif #endif

22
libs/ardour/test/sha1_test.cc
View file

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