[PATCH] initvals: use SHA1 for verifying initval arrays

* [PATCH] initvals: use SHA1 for verifying initval arrays
@ 2011-12-21 12:23 Gabor Juhos
  2011-12-21 17:02 ` Luis R. Rodriguez
  0 siblings, 1 reply; 3+ messages in thread
From: Gabor Juhos @ 2011-12-21 12:23 UTC (permalink / raw)
  To: Rodriguez Luis; +Cc: mcgrof, linux-wireless, Gabor Juhos

The current checksum implementation is broken,
it does not catch all differences in the initval
arrays.

Here is an example:

$ ./verify_checksums.sh ar9330-1p1
ar9330-1p1     3ce64df7a3121eab71a13ba9c8e9d9075ab9bae5 pass
$ cat csumtest.patch

diff --git a/ar9330_1p1_initvals.h b/ar9330_1p1_initvals.h
index f11d9b2..508df60 100644
--- a/ar9330_1p1_initvals.h
+++ b/ar9330_1p1_initvals.h
@@ -19,7 +19,7 @@

 static const u32 ar9331_1p1_baseband_postamble[][5] = {
        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-       {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+       {0x00009810, 0x110a8005, 0x220a8005, 0x330a8005, 0xd00a8005},
        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
@@ -353,7 +353,7 @@ static const u32 ar9331_1p1_xtal_25M[][2] = {

 static const u32 ar9331_1p1_radio_core[][2] = {
        /* Addr      allmodes  */
-       {0x00016000, 0x36db6db6},
+       {0x00016000, 0x00db6db6},
        {0x00016004, 0x6db6db40},
        {0x00016008, 0x73800000},
        {0x0001600c, 0x00000000},
@@ -377,7 +377,7 @@ static const u32 ar9331_1p1_radio_core[][2] = {
        {0x000160b4, 0x92480040},
        {0x000160c0, 0x006db6db},
        {0x000160c4, 0x0186db60},
-       {0x000160c8, 0x6db6db6c},
+       {0x000160c8, 0xffb6db6c},
        {0x000160cc, 0x6de6c300},
        {0x000160d0, 0x14500820},
        {0x00016100, 0x04cb0001},
$ patch < csumtest.patch
patching file ar9330_1p1_initvals.h
$ ./verify_checksums.sh ar9330-1p1
ar9330-1p1     3ce64df7a3121eab71a13ba9c8e9d9075ab9bae5 pass

Although the 'ar9330_1p1_initvals.h' file has been
patched, the checksums are the same in both cases.

This patch uses the SHA1 algorithm to generate hashes
for the initval arrays, and the modifications from above
can be catched with it:

$ ./verify_checksums.sh ar9330-1p1
ar9330-1p1     e2011010f916d63f04bb8f17dbc9b977655a6132 pass
$ patch < csumtest.patch
patching file ar9330_1p1_initvals.h
$ ./verify_checksums.sh ar9330-1p1
ar9330-1p1     e2011010f916d63f04bb8f17dbc9b977655a6132 fail
+921643355e41fca62c2a97221bbd840b2f52d614        ar9331_1p1_baseband_postamble
+f3a229b38e29634251b453334db429887d0da825        ar9331_1p1_radio_core

For the reocrd, with the SHA1 code, verify_checksums.sh
will complain about the following:

$ ./verify_checksums.sh ar5008 ar9001
ar5008         e9b2f3c70ec0b86c9fe2b8611456743ee38f51c2 fail
+c8eae8c7820dded15c9f6e4d491f114faabcf70c        ar5416Common
ar9001         1b4ad3f6abde428039b8f813f9985246ef8b0d00 fail
+253547730d9a29d6236b82946f9a51b76c93041b        ar5416Common_9160

The checksum mismatch is caused by the fact, that the
CRC error fix submitted upstream is not yet present in
Atheros initvals.

The used SHA1 code is in public domain and it has
been taken from the MPICH2 project:

http://trac.mcs.anl.gov/projects/mpich2/export/8501/mpich2/trunk/src/mpi/romio/adio/common/sha1.c
http://trac.mcs.anl.gov/projects/mpich2/export/8501/mpich2/trunk/src/mpi/romio/adio/common/sha1.h

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
 Makefile            |    6 +-
 initvals.c          |   55 ++++----
 sha1.c              |  375 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sha1.h              |   27 ++++
 verify_checksums.sh |    2 +-
 5 files changed, 436 insertions(+), 29 deletions(-)
 create mode 100644 sha1.c
 create mode 100644 sha1.h

diff --git a/Makefile b/Makefile
index 0df14df..50fd689 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,10 @@ ATH9K_DEPS += \
 	ar9485_initvals.h	\
 	ar9580_1p0_initvals.h
 
-initvals: $(ATH9K_DEPS) $(ATHEROS_DEPS) initvals.c
-	gcc $(LOCAL_CFLAGS) -o $@ $@.c
+SOURCES:=initvals.c sha1.c
+
+initvals: $(ATH9K_DEPS) $(ATHEROS_DEPS) $(SOURCES)
+	gcc $(LOCAL_CFLAGS) -o $@ $(SOURCES)
 
 all: initvals
 
diff --git a/initvals.c b/initvals.c
index ed7152c..398f5a2 100644
--- a/initvals.c
+++ b/initvals.c
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
+#include "sha1.h"
 
 typedef uint32_t u32;
 typedef long long unsigned int u64;
@@ -254,10 +255,10 @@ typedef long long unsigned int u64;
 
 #define INI_PRINT(_array) do { \
 	if (check) { \
-		u64 chksum; \
-		chksum = ath9k_hw_check_initval((const u32 *) &_array,\
+		char *sha1sum; \
+		sha1sum = ath9k_hw_check_initval((const u32 *) &_array,\
 						ARRAY_SIZE(_array), ARRAY_SIZE((_array)[0])); \
-		printf("0x%016llx        "#_array"\n", chksum); \
+		printf("%s        "#_array"\n", sha1sum); \
 	} else { \
 		printf("static const u32 "#_array"[][%d] = {\n", (int) ARRAY_SIZE((_array)[0])); \
 		ath9k_hw_print_initval((const u32 *) _array, \
@@ -267,10 +268,10 @@ typedef long long unsigned int u64;
 
 #define INI_PRINT_ONEDIM(_array) do { \
 	if (check) { \
-		u64 chksum; \
-		chksum = ath9k_hw_check_initval((const u32 *) &_array,\
+		char *sha1sum; \
+		sha1sum = ath9k_hw_check_initval((const u32 *) &_array,\
 						ARRAY_SIZE(_array), 1); \
-		printf("0x%016llx        "#_array"\n", chksum); \
+		printf("%s        "#_array"\n", sha1sum); \
 	} else { \
 		printf("static const u32 "#_array"[] = {\n"); \
 		ath9k_hw_print_initval((const u32 *) _array, \
@@ -360,33 +361,35 @@ static void ath9k_hw_print_initval(const u32 *array, u32 rows, u32 columns, bool
 	printf("};\n\n");
 }
 
-static u64 ath9k_hw_check_initval(const u32 *array, u32 rows, u32 columns)
+static char *ath9k_hw_check_initval(const u32 *array, u32 rows, u32 columns)
 {
-	u32 chksum = 0, col, row;
-
-	/*
-	 * This checksum stuff is designed for columns <= 8),
-	 * and spreads the checksum over 64 bits but since currently
-	 * the initval max column size is 6 we only use the first 48
-	 * bits.
-	 */
-	if (columns > 6)
-		return 0;
+	SHA1_CTX ctx;
+	unsigned char digest[SHA1_DIGEST_SIZE];
+	static char buf[64];
+	u32 col, row;
 
+	SHA1_Init(&ctx);
 	for (row = 0; row < rows; row++) {
 		for (col = 0; col < columns; col++) {
-			/*
-			 * To ensure that swaps of values on the same column yield
-			 * different checksums we use the row and column position to
-			 * mix the checksum.
-			 */
-			u32 uniq_row_col_pos = (row + 11) * (col + 17);
-			u32 uniq_val_pos = array[row * columns + col] + (97 * uniq_row_col_pos);
-			chksum ^= (uniq_val_pos << (8 * col));
+			unsigned char sha1_buf[4];
+			u32 val;
+
+			val = array[row * columns + col];
+
+			sha1_buf[0] = (val >> 24) & 0xff;
+			sha1_buf[1] = (val >> 16) & 0xff;
+			sha1_buf[2] = (val >> 8) & 0xff;
+			sha1_buf[3] = val & 0xff;
+			SHA1_Update(&ctx, sha1_buf, sizeof(sha1_buf));
 		}
 	}
 
-	return chksum;
+	SHA1_Final(&ctx, digest);
+	for (col = 0; col < SHA1_DIGEST_SIZE; col++)
+		sprintf(&buf[col * 2], "%02x", digest[col]);
+	buf[col * 2] = '\0';
+
+	return buf;
 }
 
 static void ar5008_hw_print_initvals(bool check)
diff --git a/sha1.c b/sha1.c
new file mode 100644
index 0000000..3d8254a
--- /dev/null
+++ b/sha1.c
@@ -0,0 +1,375 @@
+/*
+SHA-1 in C
+By Steve Reid <sreid@sea-to-sky.net>
+100% Public Domain
+
+-----------------
+Modified 7/98
+By James H. Brown <jbrown@burgoyne.com>
+Still 100% Public Domain
+
+Corrected a problem which generated improper hash values on 16 bit machines
+Routine SHA1Update changed from
+	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+len)
+to
+	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+long len)
+
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
+against
+it.  This caused the hash function to generate incorrect values if len was
+greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+Since the file IO in main() reads 16K at a time, any file 8K or larger would
+be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+"a"s).
+
+I also changed the declaration of variables i & j in SHA1Update to
+unsigned long from unsigned int for the same reason.
+
+These changes should make no difference to any 32 bit implementations since
+an
+int and a long are the same size in those environments.
+
+--
+I also corrected a few compiler warnings generated by Borland C.
+1. Added #include <process.h> for exit() prototype
+2. Removed unused variable 'j' in SHA1Final
+3. Changed exit(0) to return(0) at end of main.
+
+ALL changes I made can be located by searching for comments containing 'JHB'
+-----------------
+Modified 8/98
+By Steve Reid <sreid@sea-to-sky.net>
+Still 100% public domain
+
+1- Removed #include <process.h> and used return() instead of exit()
+2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
+
+-----------------
+Modified 4/01
+By Saul Kravitz <Saul.Kravitz@celera.com>
+Still 100% PD
+Modified to run on Compaq Alpha hardware.
+
+-----------------
+Modified 07/2002
+By Ralph Giles <giles@ghostscript.com>
+Still 100% public domain
+modified for use with stdint types, autoconf
+code cleanup, removed attribution comments
+switched SHA1Final() argument order for consistency
+use SHA1_ prefix for public api
+move public api to sha1.h
+*/
+
+/*
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define SHA1HANDSOFF  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include <stdint.h>
+#include "sha1.h"
+
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+/* FIXME: can we do this in an endian-proof way? */
+#ifdef WORDS_BIGENDIAN
+#define blk0(i) block->l[i]
+#else
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+#ifdef VERBOSE  /* SAK */
+void SHAPrintContext(SHA1_CTX *context, char *msg){
+  printf("%s (%d,%d) %x %x %x %x %x\n",
+	 msg,
+	 context->count[0], context->count[1],
+	 context->state[0],
+	 context->state[1],
+	 context->state[2],
+	 context->state[3],
+	 context->state[4]);
+}
+#endif /* VERBOSE */
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+    uint32_t a, b, c, d, e;
+    typedef union {
+        uint8_t c[64];
+        uint32_t l[16];
+    } CHAR64LONG16;
+    CHAR64LONG16* block;
+
+#ifdef SHA1HANDSOFF
+    static uint8_t workspace[64];
+    block = (CHAR64LONG16*)workspace;
+    memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16*)buffer;
+#endif
+
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+void SHA1_Init(SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
+{
+    size_t i, j;
+
+#ifdef VERBOSE
+    SHAPrintContext(context, "before");
+#endif
+
+    j = (context->count[0] >> 3) & 63;
+    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+    context->count[1] += (len >> 29);
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1_Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1_Transform(context->state, data + i);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+
+#ifdef VERBOSE
+    SHAPrintContext(context, "after ");
+#endif
+}
+
+
+/* Add padding and return the message digest. */
+void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+{
+    uint32_t i;
+    uint8_t  finalcount[8];
+
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+    SHA1_Update(context, (uint8_t *)"\200", 1);
+    while ((context->count[0] & 504) != 448) {
+        SHA1_Update(context, (uint8_t *)"\0", 1);
+    }
+    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+    for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
+        digest[i] = (uint8_t)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+
+    /* Wipe variables */
+    i = 0;
+    memset(context->buffer, 0, 64);
+    memset(context->state, 0, 20);
+    memset(context->count, 0, 8);
+    memset(finalcount, 0, 8);	/* SWR */
+
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite its own static vars */
+    SHA1_Transform(context->state, context->buffer);
+#endif
+}
+
+/*************************************************************/
+
+#if 0
+int main(int argc, char** argv)
+{
+int i, j;
+SHA1_CTX context;
+unsigned char digest[SHA1_DIGEST_SIZE], buffer[16384];
+FILE* file;
+
+    if (argc > 2) {
+        puts("Public domain SHA-1 implementation - by Steve Reid <sreid@sea-to-sky.net>");
+        puts("Modified for 16 bit environments 7/98 - by James H. Brown <jbrown@burgoyne.com>");	/* JHB */
+        puts("Produces the SHA-1 hash of a file, or stdin if no file is specified.");
+        return(0);
+    }
+    if (argc < 2) {
+        file = stdin;
+    }
+    else {
+        if (!(file = fopen(argv[1], "rb"))) {
+            fputs("Unable to open file.", stderr);
+            return(-1);
+        }
+    }
+    SHA1_Init(&context);
+    while (!feof(file)) {  /* note: what if ferror(file) */
+        i = fread(buffer, 1, 16384, file);
+        SHA1_Update(&context, buffer, i);
+    }
+    SHA1_Final(&context, digest);
+    fclose(file);
+    for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
+        for (j = 0; j < 4; j++) {
+            printf("%02X", digest[i*4+j]);
+        }
+        putchar(' ');
+    }
+    putchar('\n');
+    return(0);	/* JHB */
+}
+#endif
+
+/* self test */
+
+#ifdef TEST
+
+static char *test_data[] = {
+    "abc",
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    "A million repetitions of 'a'"};
+static char *test_results[] = {
+    "A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
+    "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
+    "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F"};
+
+
+void digest_to_hex(const uint8_t digest[SHA1_DIGEST_SIZE], char *output)
+{
+    int i,j;
+    char *c = output;
+
+    for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
+        for (j = 0; j < 4; j++) {
+            sprintf(c,"%02X", digest[i*4+j]);
+            c += 2;
+        }
+        sprintf(c, " ");
+        c += 1;
+    }
+    *(c - 1) = '\0';
+}
+
+int main(int argc, char** argv)
+{
+    int k;
+    SHA1_CTX context;
+    uint8_t digest[20];
+    char output[80];
+
+    fprintf(stdout, "verifying SHA-1 implementation... ");
+
+    for (k = 0; k < 2; k++){
+        SHA1_Init(&context);
+        SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
+        SHA1_Final(&context, digest);
+	digest_to_hex(digest, output);
+
+        if (strcmp(output, test_results[k])) {
+            fprintf(stdout, "FAIL\n");
+            fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[k]);
+            fprintf(stderr,"\t%s returned\n", output);
+            fprintf(stderr,"\t%s is correct\n", test_results[k]);
+            return (1);
+        }
+    }
+    /* million 'a' vector we feed separately */
+    SHA1_Init(&context);
+    for (k = 0; k < 1000000; k++)
+        SHA1_Update(&context, (uint8_t*)"a", 1);
+    SHA1_Final(&context, digest);
+    digest_to_hex(digest, output);
+    if (strcmp(output, test_results[2])) {
+        fprintf(stdout, "FAIL\n");
+        fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[2]);
+        fprintf(stderr,"\t%s returned\n", output);
+        fprintf(stderr,"\t%s is correct\n", test_results[2]);
+        return (1);
+    }
+
+    /* success */
+    fprintf(stdout, "ok\n");
+    return(0);
+}
+#endif /* TEST */
diff --git a/sha1.h b/sha1.h
new file mode 100644
index 0000000..e57a8c3
--- /dev/null
+++ b/sha1.h
@@ -0,0 +1,27 @@
+/* public api for steve reid's public domain SHA-1 implementation */
+/* this file is in the public domain */
+
+#ifndef __SHA1_H
+#define __SHA1_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    uint8_t  buffer[64];
+} SHA1_CTX;
+
+#define SHA1_DIGEST_SIZE 20
+
+void SHA1_Init(SHA1_CTX* context);
+void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
+void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SHA1_H */
diff --git a/verify_checksums.sh b/verify_checksums.sh
index 88915e4..6878ca5 100755
--- a/verify_checksums.sh
+++ b/verify_checksums.sh
@@ -27,7 +27,7 @@ verify_family_checksum()
 	[ "$sum_hal" == "$sum_ath9k" ] && res="pass" || res="fail"
 	printf "%-14s %-40s %s\n" "$family" "$sum_hal" "$res"
 	[ "$res" == "fail" ] && \
-		diff -Nurw "$CSUM_DIR/${family}_hal.txt" "$CSUM_DIR/${family}_ath9k.txt" | grep '^+0'
+		diff -Nurw "$CSUM_DIR/${family}_hal.txt" "$CSUM_DIR/${family}_ath9k.txt" | grep '^+[0-9a-f]'
 }
 
 FAMILIES="$@"
-- 
1.7.2.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread