(1) Added functionality to do single block tests of all SHA-512/x modes. (2) Major cleanup of nits and magic constants. Moved all test cases to separate functions. Added support to enable/disable tests.

1 files changed, 397 insertions, 139 deletions

diff --git a/src/sw/hash_tester.py b/src/sw/hash_tester.py
index c76c273..1d8d5b0 100755
--- a/src/sw/hash_tester.py
+++ b/src/sw/hash_tester.py
@@ -12,6 +12,10 @@
 # Note: This program requires the PySerial module.
 # http://pyserial.sourceforge.net/
 #
+# The single and dual block test cases are taken from the
+# NIST KAT document:
+# http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA_All.pdf
+#
 # 
 # Author: Joachim Strömbergson
 # Copyright (c) 2014, SUNET
@@ -68,6 +72,8 @@ STOP_BITS = 1
 # Verbose operation on/off
 VERBOSE = False
 
+# Delay time we wait
+DELAY_TIME = 0.05
 
 # Memory map.
 SOC                   = '\x55'
@@ -82,8 +88,8 @@ SHA1_ADDR_NAME0       = '\x00'
 SHA1_ADDR_NAME1       = '\x01'
 SHA1_ADDR_VERSION     = '\x02'
 SHA1_ADDR_CTRL        = '\x08'
-SHA1_CTRL_INIT_BIT    = 0
-SHA1_CTRL_NEXT_BIT    = 1
+SHA1_CTRL_INIT_CMD    = '\x01'
+SHA1_CTRL_NEXT_CMD    = '\x02'
 SHA1_ADDR_STATUS      = '\x09'
 SHA1_STATUS_READY_BIT = 0
 SHA1_STATUS_VALID_BIT = 1
@@ -114,8 +120,8 @@ SHA256_ADDR_NAME0       = '\x00'
 SHA256_ADDR_NAME1       = '\x01'
 SHA256_ADDR_VERSION     = '\x02'
 SHA256_ADDR_CTRL        = '\x08'
-SHA256_CTRL_INIT_BIT    = 0
-SHA256_CTRL_NEXT_BIT    = 1
+SHA256_CTRL_INIT_CMD    = '\x01'
+SHA256_CTRL_NEXT_CMD    = '\x02'
 SHA256_ADDR_STATUS      = '\x09'
 SHA256_STATUS_READY_BIT = 0
 SHA256_STATUS_VALID_BIT = 1
@@ -144,9 +150,71 @@ SHA256_ADDR_DIGEST5     = '\x25'
 SHA256_ADDR_DIGEST6     = '\x26'
 SHA256_ADDR_DIGEST7     = '\x27'
 
-NAME0_ADDR            = '\x00'
-NAME1_ADDR            = '\x01'
-VERSION_ADDR          = '\x02'
+SHA512_ADDR_PREFIX      = '\x30'
+SHA512_ADDR_NAME0       = '\x00'
+SHA512_ADDR_NAME1       = '\x01'
+SHA512_ADDR_VERSION     = '\x02'
+SHA512_ADDR_CTRL        = '\x08'
+SHA512_CTRL_INIT_CMD    = '\x01'
+SHA512_CTRL_NEXT_CMD    = '\x02'
+SHA512_CTRL_MODE_LOW    = 2
+SHA512_CTRL_MODE_HIGH   = 3
+SHA512_ADDR_STATUS      = '\x09'
+SHA512_STATUS_READY_BIT = 0
+SHA512_STATUS_VALID_BIT = 1
+SHA512_ADDR_BLOCK0      = '\x10'
+SHA512_ADDR_BLOCK1      = '\x11'
+SHA512_ADDR_BLOCK2      = '\x12'
+SHA512_ADDR_BLOCK3      = '\x13'
+SHA512_ADDR_BLOCK4      = '\x14'
+SHA512_ADDR_BLOCK5      = '\x15'
+SHA512_ADDR_BLOCK6      = '\x16'
+SHA512_ADDR_BLOCK7      = '\x17'
+SHA512_ADDR_BLOCK8      = '\x18'
+SHA512_ADDR_BLOCK9      = '\x19'
+SHA512_ADDR_BLOCK10     = '\x1a'
+SHA512_ADDR_BLOCK11     = '\x1b'
+SHA512_ADDR_BLOCK12     = '\x1c'
+SHA512_ADDR_BLOCK13     = '\x1d'
+SHA512_ADDR_BLOCK14     = '\x1e'
+SHA512_ADDR_BLOCK15     = '\x1f'
+SHA512_ADDR_BLOCK16     = '\x20'
+SHA512_ADDR_BLOCK17     = '\x21'
+SHA512_ADDR_BLOCK18     = '\x22'
+SHA512_ADDR_BLOCK19     = '\x23'
+SHA512_ADDR_BLOCK20     = '\x24'
+SHA512_ADDR_BLOCK21     = '\x25'
+SHA512_ADDR_BLOCK22     = '\x26'
+SHA512_ADDR_BLOCK23     = '\x27'
+SHA512_ADDR_BLOCK24     = '\x28'
+SHA512_ADDR_BLOCK25     = '\x29'
+SHA512_ADDR_BLOCK26     = '\x2a'
+SHA512_ADDR_BLOCK27     = '\x2b'
+SHA512_ADDR_BLOCK28     = '\x2c'
+SHA512_ADDR_BLOCK29     = '\x2d'
+SHA512_ADDR_BLOCK30     = '\x2e'
+SHA512_ADDR_BLOCK31     = '\x2f'
+SHA512_ADDR_DIGEST0     = '\x40'
+SHA512_ADDR_DIGEST1     = '\x41'
+SHA512_ADDR_DIGEST2     = '\x42'
+SHA512_ADDR_DIGEST3     = '\x43'
+SHA512_ADDR_DIGEST4     = '\x44'
+SHA512_ADDR_DIGEST5     = '\x45'
+SHA512_ADDR_DIGEST6     = '\x46'
+SHA512_ADDR_DIGEST7     = '\x47'
+SHA512_ADDR_DIGEST8     = '\x48'
+SHA512_ADDR_DIGEST9     = '\x49'
+SHA512_ADDR_DIGEST10    = '\x4a'
+SHA512_ADDR_DIGEST11    = '\x4b'
+SHA512_ADDR_DIGEST12    = '\x4c'
+SHA512_ADDR_DIGEST13    = '\x4d'
+SHA512_ADDR_DIGEST14    = '\x4e'
+SHA512_ADDR_DIGEST15    = '\x4f'
+
+MODE_SHA_512_224 = '\x00'
+MODE_SHA_512_256 = '\x01'
+MODE_SHA_384     = '\x02'
+MODE_SHA_512     = '\x03'
 
 sha1_block_addr = [SHA1_ADDR_BLOCK0,  SHA1_ADDR_BLOCK1,
                    SHA1_ADDR_BLOCK2,  SHA1_ADDR_BLOCK3,
@@ -175,6 +243,76 @@ sha256_digest_addr = [SHA256_ADDR_DIGEST0,  SHA256_ADDR_DIGEST1,
                       SHA256_ADDR_DIGEST4,  SHA256_ADDR_DIGEST5,
                       SHA256_ADDR_DIGEST6,  SHA256_ADDR_DIGEST7]
 
+sha512_block_addr = [SHA512_ADDR_BLOCK0,  SHA512_ADDR_BLOCK1,
+                     SHA512_ADDR_BLOCK2,  SHA512_ADDR_BLOCK3,
+                     SHA512_ADDR_BLOCK4,  SHA512_ADDR_BLOCK5,
+                     SHA512_ADDR_BLOCK6,  SHA512_ADDR_BLOCK7,
+                     SHA512_ADDR_BLOCK8,  SHA512_ADDR_BLOCK9,
+                     SHA512_ADDR_BLOCK10, SHA512_ADDR_BLOCK11,
+                     SHA512_ADDR_BLOCK12, SHA512_ADDR_BLOCK13,
+                     SHA512_ADDR_BLOCK14, SHA512_ADDR_BLOCK15,
+                     SHA512_ADDR_BLOCK16, SHA512_ADDR_BLOCK17,
+                     SHA512_ADDR_BLOCK18, SHA512_ADDR_BLOCK19,
+                     SHA512_ADDR_BLOCK20, SHA512_ADDR_BLOCK21,
+                     SHA512_ADDR_BLOCK22, SHA512_ADDR_BLOCK23,
+                     SHA512_ADDR_BLOCK24, SHA512_ADDR_BLOCK25,
+                     SHA512_ADDR_BLOCK26, SHA512_ADDR_BLOCK27,
+                     SHA512_ADDR_BLOCK28, SHA512_ADDR_BLOCK29,
+                     SHA512_ADDR_BLOCK30, SHA512_ADDR_BLOCK31]
+
+sha512_digest_addr = [SHA512_ADDR_DIGEST0,  SHA512_ADDR_DIGEST1,
+                      SHA512_ADDR_DIGEST2,  SHA512_ADDR_DIGEST3,
+                      SHA512_ADDR_DIGEST4,  SHA512_ADDR_DIGEST5,
+                      SHA512_ADDR_DIGEST6,  SHA512_ADDR_DIGEST7,
+                      SHA512_ADDR_DIGEST8,  SHA512_ADDR_DIGEST9,
+                      SHA512_ADDR_DIGEST10, SHA512_ADDR_DIGEST11,
+                      SHA512_ADDR_DIGEST12, SHA512_ADDR_DIGEST13,
+                      SHA512_ADDR_DIGEST14, SHA512_ADDR_DIGEST15]
+
+NIST_512_SINGLE = ['\x61', '\x62', '\x63', '\x80', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x18']
+
+NIST_512_DOUBLE0 = ['\x61', '\x62', '\x63', '\x64', '\x62', '\x63', '\x64', '\x65',
+                   '\x63', '\x64', '\x65', '\x66', '\x64', '\x65', '\x66', '\x67',
+                   '\x65', '\x66', '\x67', '\x68', '\x66', '\x67', '\x68', '\x69',
+                   '\x67', '\x68', '\x69', '\x6A', '\x68', '\x69', '\x6A', '\x6B',
+                   '\x69', '\x6A', '\x6B', '\x6C', '\x6A', '\x6B', '\x6C', '\x6D',
+                   '\x6B', '\x6C', '\x6D', '\x6E', '\x6C', '\x6D', '\x6E', '\x6F',
+                   '\x6D', '\x6E', '\x6F', '\x70', '\x6E', '\x6F', '\x70', '\x71',
+                   '\x80', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00']
+
+NIST_512_DOUBLE1 = ['\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x01', '\xC0']
+
+NIST_1024_SINGLE = ['\x61', '\x62', '\x63', '\x80', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
+                    '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x18']
+
 
 #-------------------------------------------------------------------
 # print_response()
@@ -235,7 +373,7 @@ def read_serial_thread(serialport):
                 buffer = []
         else:
             print "No open device yet."
-            time.sleep(0.1)
+            time.sleep(DELAY_TIME)
             
 
 #-------------------------------------------------------------------
@@ -251,7 +389,45 @@ def write_serial_bytes(tx_cmd, serialport):
         serialport.write(tx_byte)
 
     # Allow the device to complete the transaction.
-    time.sleep(0.1)
+    time.sleep(DELAY_TIME)
+
+
+#-------------------------------------------------------------------
+# single_block_test_sha512x()
+#
+# Write a given block to SHA-512/x and perform single block
+# processing for the given mode.
+#-------------------------------------------------------------------
+def single_block_test_sha512x(block, mode, ser):
+    # Write block to SHA-512.
+    for i in range(len(block) / 4):
+        message = [SOC, WRITE_CMD, SHA512_ADDR_PREFIX,] + [sha512_block_addr[i]] +\
+                  block[(i * 4) : ((i * 4 ) + 4)] + [EOC]
+        write_serial_bytes(message, ser)
+
+    # Start initial block hashing, wait and check status.
+    mode_cmd = chr(ord(SHA512_CTRL_INIT_CMD) + (ord(mode) << SHA512_CTRL_MODE_LOW))
+    write_serial_bytes([SOC, WRITE_CMD, SHA512_ADDR_PREFIX, SHA512_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', mode_cmd, EOC], ser)
+    time.sleep(DELAY_TIME)
+    write_serial_bytes([SOC, READ_CMD, SHA512_ADDR_PREFIX, SHA512_ADDR_STATUS, EOC], ser)
+    time.sleep(DELAY_TIME)
+
+    # Select the correct number of digest addresses to read.
+    if (mode == MODE_SHA_512_224):
+        mode_digest_addr = sha512_digest_addr[0 : 7]
+    elif (mode == MODE_SHA_512_256):
+        mode_digest_addr = sha512_digest_addr[0 : 8]
+    elif (mode == MODE_SHA_384):
+        mode_digest_addr = sha512_digest_addr[0 : 12]
+    elif (mode == MODE_SHA_512):
+        mode_digest_addr = sha512_digest_addr
+
+    # Extract the digest.
+    for digest_addr in mode_digest_addr:
+        message = [SOC, READ_CMD, SHA512_ADDR_PREFIX] + [digest_addr] + [EOC]
+        write_serial_bytes(message, ser)
+    print""
 
 
 #-------------------------------------------------------------------
@@ -268,13 +444,14 @@ def single_block_test_sha256(block, ser):
         write_serial_bytes(message, ser)
 
     # Start initial block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x01', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA256_CTRL_INIT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_STATUS, EOC], ser)
 
-    # Extract contents of the digest registers.
-    for i in range(8):
-        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [sha256_digest_addr[i]] + [EOC]
+    # Extract the digest.
+    for digest_addr in sha256_digest_addr:
+        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
 
@@ -292,13 +469,14 @@ def double_block_test_sha256(block1, block2, ser):
         write_serial_bytes(message, ser)
 
     # Start initial block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x01', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA256_CTRL_INIT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_STATUS, EOC], ser)
 
-    # Extract contents of the digest registers.
-    for i in range(8):
-        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [sha256_digest_addr[i]] + [EOC]
+    # Extract the first digest.
+    for digest_addr in sha256_digest_addr:
+        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
 
@@ -309,20 +487,21 @@ def double_block_test_sha256(block1, block2, ser):
         write_serial_bytes(message, ser)
 
     # Start next block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x02', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA256_CTRL_NEXT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_STATUS, EOC], ser)
 
-    # Extract contents of the digest registers.
-    for i in range(8):
-        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [sha256_digest_addr[i]] + [EOC]
+    # Extract the second digest.
+    for digest_addr in sha256_digest_addr:
+        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
 
 
 #-------------------------------------------------------------------
 # huge_message_test_sha256()
-
+#
 # Test with a message with a huge number (n) number of blocks.
 #-------------------------------------------------------------------
 def huge_message_test_sha256(block, n, ser):
@@ -333,24 +512,33 @@ def huge_message_test_sha256(block, n, ser):
         write_serial_bytes(message, ser)
 
     # Start initial block hashing, wait.
-    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x01', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA256_CTRL_INIT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     print "Block 0 done."
 
-    # First blocl done.
+    # First block done.
     n = n - 1
 
+    # Extract the digest for the current block.
+    for digest_addr in sha256_digest_addr:
+        message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [digest_addr] + [EOC]
+        write_serial_bytes(message, ser)
+        print""
+
     for i in range(n):
         # Start next block hashing, wait.
-        write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x02', EOC], ser)
-        time.sleep(0.1)
+        write_serial_bytes([SOC, WRITE_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_CTRL,
+                            '\x00', '\x00', '\x00', SHA256_CTRL_NEXT_CMD, EOC], ser)
         print "Block %d done." % (i + 1)
+        time.sleep(DELAY_TIME)
 
-        # Extract contents of the digest registers.
-        for i in range(8):
-            message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [sha256_digest_addr[i]] + [EOC]
+        # Extract the digest for the current block.
+        for digest_addr in sha256_digest_addr:
+            message = [SOC, READ_CMD, SHA256_ADDR_PREFIX] + [digest_addr] + [EOC]
             write_serial_bytes(message, ser)
             print""
+        time.sleep(DELAY_TIME)
 
 
 #-------------------------------------------------------------------
@@ -367,13 +555,14 @@ def single_block_test_sha1(block, ser):
         write_serial_bytes(message, ser)
 
     # Start initial block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x01', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA1_CTRL_INIT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_STATUS,   EOC], ser)
 
     # Extract the digest.
-    for i in range(5):
-        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [sha1_digest_addr[i]] + [EOC]
+    for digest_addr in sha1_digest_addr:
+        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
     
@@ -391,13 +580,14 @@ def double_block_test_sha1(block1, block2, ser):
         write_serial_bytes(message, ser)
 
     # Start initial block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x01', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA1_CTRL_INIT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_STATUS,   EOC], ser)
 
-    # Extract the digest.
-    for i in range(5):
-        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [sha1_digest_addr[i]] + [EOC]
+    # Extract the first digest.
+    for digest_addr in sha1_digest_addr:
+        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
 
@@ -408,53 +598,22 @@ def double_block_test_sha1(block1, block2, ser):
         write_serial_bytes(message, ser)
 
     # Start next block hashing, wait and check status.
-    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL, '\x00', '\x00', '\x00', '\x02', EOC], ser)
-    time.sleep(0.1)
+    write_serial_bytes([SOC, WRITE_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_CTRL,
+                        '\x00', '\x00', '\x00', SHA1_CTRL_NEXT_CMD, EOC], ser)
+    time.sleep(DELAY_TIME)
     write_serial_bytes([SOC, READ_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_STATUS,   EOC], ser)
 
-    # Extract the digest.
-    for i in range(5):
-        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [sha1_digest_addr[i]] + [EOC]
+    # Extract the second digest.
+    for digest_addr in sha1_digest_addr:
+        message = [SOC, READ_CMD, SHA1_ADDR_PREFIX] + [digest_addr] + [EOC]
         write_serial_bytes(message, ser)
     print""
 
 
 #-------------------------------------------------------------------
-# main()
-#
-# Parse any arguments and run the tests.
+# TC1: Read name and version from SHA-1 core.
 #-------------------------------------------------------------------
-def main():
-    # Open device
-    ser = serial.Serial()
-    ser.port=SERIAL_DEVICE
-    ser.baudrate=BAUD_RATE
-    ser.bytesize=DATA_BITS
-    ser.parity='N'
-    ser.stopbits=STOP_BITS
-    ser.timeout=1
-    ser.writeTimeout=0
-
-    if VERBOSE:
-        print "Setting up a serial port and starting a receive thread."
-
-    try:
-        ser.open()
-    except:
-        print "Error: Can't open serial device."
-        sys.exit(1)
-
-    try:
-        my_thread = threading.Thread(target=read_serial_thread, args=(ser,))
-    except:
-        print "Error: Can't start thread."
-        sys.exit()
-        
-    my_thread.daemon = True
-    my_thread.start()
-
-
-    # TC1: Read name and version from SHA-1 core.
+def tc1(ser):
     print "TC1: Reading name, type and version words from SHA-1 core."
     write_serial_bytes([SOC, READ_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_NAME0, EOC], ser)
     write_serial_bytes([SOC, READ_CMD, SHA1_ADDR_PREFIX, SHA1_ADDR_NAME1, EOC], ser)
@@ -462,16 +621,11 @@ def main():
     print""
 
 
-    # TC2: Single block message test as specified by NIST.
+#-------------------------------------------------------------------
+# TC2: SHA-1 Single block message test as specified by NIST.
+#-------------------------------------------------------------------
+def tc2(ser):
     print "TC2: Single block message test for SHA-1."
-    tc2_block = ['\x61', '\x62', '\x63', '\x80', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                 '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x18']
 
     tc2_sha1_expected = [0xa9993e36, 0x4706816a, 0xba3e2571,
                          0x7850c26c, 0x9cd0d89d]
@@ -480,28 +634,14 @@ def main():
     for i in tc2_sha1_expected:
         print("0x%08x " % i)
     print("")
-    single_block_test_sha1(tc2_block, ser)
-
+    single_block_test_sha1(NIST_512_SINGLE, ser)
+    
 
-    # TC3: Double block message test as specified by NIST.
+#-------------------------------------------------------------------
+# TC3: SHA-1 Double block message test as specified by NIST.
+#-------------------------------------------------------------------
+def tc3(ser):
     print "TC3: Double block message test for SHA-1."
-    tc3_1_block = ['\x61', '\x62', '\x63', '\x64', '\x62', '\x63', '\x64', '\x65',
-                   '\x63', '\x64', '\x65', '\x66', '\x64', '\x65', '\x66', '\x67',
-                   '\x65', '\x66', '\x67', '\x68', '\x66', '\x67', '\x68', '\x69',
-                   '\x67', '\x68', '\x69', '\x6A', '\x68', '\x69', '\x6A', '\x6B',
-                   '\x69', '\x6A', '\x6B', '\x6C', '\x6A', '\x6B', '\x6C', '\x6D',
-                   '\x6B', '\x6C', '\x6D', '\x6E', '\x6C', '\x6D', '\x6E', '\x6F',
-                   '\x6D', '\x6E', '\x6F', '\x70', '\x6E', '\x6F', '\x70', '\x71',
-                   '\x80', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00']
-
-    tc3_2_block = ['\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00',
-                   '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x01', '\xC0']
 
     tc3_1_sha1_expected = [0xF4286818, 0xC37B27AE, 0x0408F581,
                            0x84677148, 0x4A566572]
@@ -517,21 +657,27 @@ def main():
     for i in tc3_2_sha1_expected:
         print("0x%08x " % i)
     print("")
-    double_block_test_sha1(tc3_1_block, tc3_2_block, ser)
+    double_block_test_sha1(NIST_512_DOUBLE0, NIST_512_DOUBLE1, ser)
 
 
-    # TC4: Read name and version from SHA-256 core.
+#-------------------------------------------------------------------
+# TC4: Read name and version from SHA-256 core.
+#-------------------------------------------------------------------
+def tc4(ser):
     print "TC4: Reading name, type and version words from SHA-256 core."
-    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, NAME0_ADDR, EOC]
+    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_NAME0, EOC]
     write_serial_bytes(my_cmd, ser)
-    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, NAME1_ADDR, EOC]
+    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_NAME1, EOC]
     write_serial_bytes(my_cmd, ser)
-    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, VERSION_ADDR, EOC]
+    my_cmd = [SOC, READ_CMD, SHA256_ADDR_PREFIX, SHA256_ADDR_VERSION, EOC]
     write_serial_bytes(my_cmd, ser)
     print""
 
 
-    # TC5: Single block message test as specified by NIST.
+#-------------------------------------------------------------------
+# TC5: SHA-256 Single block message test as specified by NIST.
+#-------------------------------------------------------------------
+def tc5(ser):
     print "TC5: Single block message test for SHA-256."
 
     tc5_sha256_expected = [0xBA7816BF, 0x8F01CFEA, 0x414140DE, 0x5DAE2223,
@@ -541,10 +687,13 @@ def main():
     for i in tc5_sha256_expected:
         print("0x%08x " % i)
     print("")
-    single_block_test_sha256(tc2_block, ser)
+    single_block_test_sha256(NIST_512_SINGLE, ser)
 
 
-    # TC6: Double block message test as specified by NIST.
+#-------------------------------------------------------------------
+# TC6: SHA-256 Double block message test as specified by NIST.
+#-------------------------------------------------------------------
+def tc6(ser):
     print "TC6: Double block message test for SHA-256."
 
     tc6_1_sha256_expected = [0x85E655D6, 0x417A1795, 0x3363376A, 0x624CDE5C,
@@ -561,29 +710,138 @@ def main():
     for i in tc6_2_sha256_expected:
         print("0x%08x " % i)
     print("")
-    double_block_test_sha256(tc3_1_block, tc3_2_block, ser)
-
-    # TC7: Huge message test.
-#    n = 10
-#    print "TC7: Message with %d blocks test for SHA-256." % n
-#    tc7_block = ['\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
-#                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
-#                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
-#                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
-#                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
-#                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
-#                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
-#                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f']
+    double_block_test_sha256(NIST_512_DOUBLE0, NIST_512_DOUBLE1, ser)
+
+
+#-------------------------------------------------------------------
+# TC7: SHA-256 Huge message test.
+#-------------------------------------------------------------------
+def tc7(ser):
+    n = 10
+    print "TC7: Message with %d blocks test for SHA-256." % n
+    tc7_block = ['\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
+                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
+                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
+                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
+                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
+                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f',
+                 '\xaa', '\x55', '\xaa', '\x55', '\xde', '\xad', '\xbe', '\xef',
+                 '\x55', '\xaa', '\x55', '\xaa', '\xf0', '\x0f', '\xf0', '\x0f']
+
+    tc7_expected = [0xf407ff0d, 0xb9dce2f6, 0x9b9759a9, 0xd3cdc805,
+                    0xf250086d, 0x73bbefd5, 0xa972e0f7, 0x61a9c13e]
+
+    print "TC7: Expected digest values after %d blocks:" %n
+    for i in tc7_expected:
+        print("0x%08x " % i)
+    print("")
+    huge_message_test_sha256(tc7_block, n, ser)
+
+
+#-------------------------------------------------------------------
+# TC8: Read name and version from SHA-512 core.
+#-------------------------------------------------------------------
+def tc8(ser):
+    print "TC8: Reading name, type and version words from SHA-512 core."
+    my_cmd = [SOC, READ_CMD, SHA512_ADDR_PREFIX, SHA512_ADDR_NAME0, EOC]
+    write_serial_bytes(my_cmd, ser)
+    my_cmd = [SOC, READ_CMD, SHA512_ADDR_PREFIX, SHA512_ADDR_NAME1, EOC]
+    write_serial_bytes(my_cmd, ser)
+    my_cmd = [SOC, READ_CMD, SHA512_ADDR_PREFIX, SHA512_ADDR_VERSION, EOC]
+    write_serial_bytes(my_cmd, ser)
+    print""
+
+
+#-------------------------------------------------------------------
+# TC9: Single block test of SHA-512
 #
-#    tc7_expected = [0xf407ff0d, 0xb9dce2f6, 0x9b9759a9, 0xd3cdc805,
-#                    0xf250086d, 0x73bbefd5, 0xa972e0f7, 0x61a9c13e]
+# We do this for all modes.
+#-------------------------------------------------------------------
+def tc9(ser):
+    print "TC9: Single block message test for SHA-512/x."
+
+    tc9_224_expected = [0x4634270f, 0x707b6a54, 0xdaae7530, 0x460842e2,
+                        0x0e37ed26, 0x5ceee9a4, 0x3e8924aa]
+
+    tc9_256_expected = [0x53048e26, 0x81941ef9, 0x9b2e29b7, 0x6b4c7dab,
+                        0xe4c2d0c6, 0x34fc6d46, 0xe0e2f131, 0x07e7af23]
+
+    tc9_384_expected = [0xcb00753f, 0x45a35e8b, 0xb5a03d69, 0x9ac65007,
+                        0x272c32ab, 0x0eded163, 0x1a8b605a, 0x43ff5bed,
+                        0x8086072b, 0xa1e7cc23, 0x58baeca1, 0x34c825a7]
+
+    tc9_512_expected = [0xddaf35a1, 0x93617aba, 0xcc417349, 0xae204131,
+                        0x12e6fa4e, 0x89a97ea2, 0x0a9eeee6, 0x4b55d39a,
+                        0x2192992a, 0x274fc1a8, 0x36ba3c23, 0xa3feebbd,
+                        0x454d4423, 0x643ce80e, 0x2a9ac94f, 0xa54ca49f]
+
+    print "TC9-1: Expected digest values for SHA-512/224 as specified by NIST:"
+    for i in tc9_224_expected:
+        print("0x%08x " % i)
+    single_block_test_sha512x(NIST_1024_SINGLE, MODE_SHA_512_224, ser)
+    print("")
+
+    print "TC9-2: Expected digest values for SHA-512/256 as specified by NIST:"
+    for i in tc9_256_expected:
+        print("0x%08x " % i)
+    single_block_test_sha512x(NIST_1024_SINGLE, MODE_SHA_512_256, ser)
+    print("")
+
+    print "TC9-3: Expected digest values for SHA-384 as specified by NIST:"
+    for i in tc9_384_expected:
+        print("0x%08x " % i)
+    single_block_test_sha512x(NIST_1024_SINGLE, MODE_SHA_384, ser)
+    print("")
+
+    print "TC9-4: Expected digest values for SHA-512 as specified by NIST:"
+    for i in tc9_512_expected:
+        print("0x%08x " % i)
+    single_block_test_sha512x(NIST_1024_SINGLE, MODE_SHA_512, ser)
+    print("")
+
+
+#-------------------------------------------------------------------
+# main()
 #
-#    print "TC7: Expected digest values after %d blocks:" %n
-#    for i in tc7_expected:
-#        print("0x%08x " % i)
-#    print("")
-#    huge_message_test_sha256(tc7_block, n, ser)
-    
+# Parse any arguments and run the tests.
+#-------------------------------------------------------------------
+def main():
+    # Open device
+    ser = serial.Serial()
+    ser.port=SERIAL_DEVICE
+    ser.baudrate=BAUD_RATE
+    ser.bytesize=DATA_BITS
+    ser.parity='N'
+    ser.stopbits=STOP_BITS
+    ser.timeout=1
+    ser.writeTimeout=0
+
+    if VERBOSE:
+        print "Setting up a serial port and starting a receive thread."
+
+    try:
+        ser.open()
+    except:
+        print "Error: Can't open serial device."
+        sys.exit(1)
+
+    try:
+        my_thread = threading.Thread(target=read_serial_thread, args=(ser,))
+    except:
+        print "Error: Can't start thread."
+        sys.exit()
+        
+    my_thread.daemon = True
+    my_thread.start()
+
+    # Run the enabled test cases.
+    tc_list = [(tc1, False), (tc2, False), (tc3, False), (tc4, False),
+               (tc5, False), (tc6, False), (tc7, False), (tc8, True),
+               (tc9, True)]
+    for (test_case, action) in tc_list:
+        if action:
+            test_case(ser)
+
     # Exit nicely.
     if VERBOSE:
         print "Done. Closing device."