Merge pull request #2 from oohlaf/master

Port to Python 3

Author: James Cleveland

.gitignore

@@ -1,3 +1,6 @@
 build/
 dist/
 MANIFEST
+*.egg-info
+*.pyc
+*.so

README.md

@@ -7,7 +7,8 @@ The Whirlpool reference implementations are public domain, as is this code.
 
 Wrapper written by James Cleveland with help from #python on irc.freenode.net.
 
-Wrapper modified by Olaf Conradi to use the hashlib interface.
+Wrapper extended to use the hashlib interface and ported to Python 3 by
+Olaf Conradi.
 
 Usage
 -----
@@ -23,12 +24,26 @@ Python's hashlib.
     wp.update("My Salt")
     hashed_string = wp.hexdigest()
 
+Starting with Python 3 text strings (as shown above) are stored as unicode.
+You need to specify the encoding of these strings before hashing.
+
+    wp = whirlpool.new(data.encoding('utf-8'))
+
+Strings that are marked as binary do not need encoding.
+
 Deprecated usage
 ----------------
 
-For backward compatibility the old interface remains available.
+For backward compatibility the old interface remains available. From Python 3
+onwards, the old interface is dropped.
 
     import whirlpool
 
     hashed_string = whirlpool.hash("My String")
 
+
+Testing
+-------
+
+This module is tested using Python 2.7 and Python 3.3.
+

Whirlpool.c

@@ -1715,7 +1715,7 @@ static void display(const u8 array[], int length) {
  * 2. hashing all 512-bit strings containing a single set bit;
  * 3. the iterated hashing of the 512-bit string of zero bits a large number of times.
  */
-void makeNESSIETestVectors() {
+void makeNESSIETestVectors(void) {
     int i;
     struct NESSIEstruct w;
     u8 digest[DIGESTBYTES];
@@ -1758,7 +1758,7 @@ void makeNESSIETestVectors() {
 /*
 #define TIMING_ITERATIONS 100000
 
-static void timing() {
+static void timing(void) {
     int i;
     NESSIEstruct w;
     u8 digest[DIGESTBYTES];
@@ -1824,7 +1824,7 @@ void testAPI(void) {
                 }
                 NESSIEfinalize(&w, computedDigest);
                 if (memcmp(computedDigest, expectedDigest, DIGESTBYTES) != 0) {
-                    fprintf(stderr, "API error @ pieceLen = %lu\n", pieceLen);
+                    fprintf(stderr, "API error @ pieceLen = %u\n", pieceLen);
                     display(computedDigest, DIGESTBYTES); printf("\n\n");
                     display(expectedDigest, DIGESTBYTES); printf("\n\n");
                     return;
@@ -1842,7 +1842,7 @@ void testAPI(void) {
     printf("No error detected.\n");
 }
 
-void makeISOTestVectors() {
+void makeISOTestVectors(void) {
     struct NESSIEstruct w;
     u8 digest[DIGESTBYTES];
     static u8 data[1000000];
@@ -1858,49 +1858,49 @@ void makeISOTestVectors() {
 
     printf("2. In this example the data-string consists of a single byte, namely the ASCII-coded version of the letter 'a'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("a", 8*1, &w);
+    NESSIEadd((u8*)"a", 8*1, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("3. In this example the data-string is the three-byte string consisting of the ASCII-coded version of 'abc'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("abc", 8*3, &w);
+    NESSIEadd((u8*)"abc", 8*3, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("4. In this example the data-string is the 14-byte string consisting of the ASCII-coded version of 'message digest'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("message digest", 8*14, &w);
+    NESSIEadd((u8*)"message digest", 8*14, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("5. In this example the data-string is the 26-byte string consisting of the ASCII-coded version of 'abcdefghijklmnopqrstuvwxyz'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("abcdefghijklmnopqrstuvwxyz", 8*26, &w);
+    NESSIEadd((u8*)"abcdefghijklmnopqrstuvwxyz", 8*26, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("6. In this example the data-string is the 62-byte string consisting of the ASCII-coded version of 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 8*62, &w);
+    NESSIEadd((u8*)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 8*62, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("7. In this example the data-string is the 80-byte string consisting of the ASCII-coded version of eight repetitions of '1234567890'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("12345678901234567890123456789012345678901234567890123456789012345678901234567890", 8*80, &w);
+    NESSIEadd((u8*)"12345678901234567890123456789012345678901234567890123456789012345678901234567890", 8*80, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
 
     printf("8. In this example the data-string is the 32-byte string consisting of the ASCII-coded version of 'abcdbcdecdefdefgefghfghighijhijk'.\n\n");
     NESSIEinit(&w);
-    NESSIEadd("abcdbcdecdefdefgefghfghighijhijk", 8*32, &w);
+    NESSIEadd((u8*)"abcdbcdecdefdefgefghfghighijhijk", 8*32, &w);
     NESSIEfinalize(&w, digest);
     printf("The hash-code is the following 512-bit string.\n\n");
     display(digest, DIGESTBYTES); printf("\n\n");
@@ -1920,7 +1920,7 @@ void makeISOTestVectors() {
 }
 
 #ifdef TRACE_INTERMEDIATE_VALUES
-static void makeIntermediateValues() {
+static void makeIntermediateValues(void) {
     struct NESSIEstruct w;
     u8 digest[DIGESTBYTES];