commit 9e36f0475f011912ee0897aa6487d7b9c190600e
author Paul Bakker <p.j.bakker@polarssl.org> Sun Jun 30 14:34:05 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Jun 30 14:34:05 2013 +0200
tree 8a0ba5220ecf20ce6b0d54e4871c3cace063bdd0
parent 3866b9f4b5e36325dc5e48229bfc2c3a82a1a122

SHA2 renamed to SHA256, SHA4 renamed to SHA512 and functions accordingly

The SHA4 name was not clear with regards to the new SHA-3 standard. So
SHA2 and SHA4 have been renamed to better represent what they are:
SHA256 and SHA512 modules.

tests/suites/test_suite_shax.function

diff --git a/tests/suites/test_suite_shax.function b/tests/suites/test_suite_shax.function
index 13aff7a..f5efa48 100644
--- a/tests/suites/test_suite_shax.function
+++ b/tests/suites/test_suite_shax.function
@@ -39,7 +39,7 @@
 
     src_len = unhexify( src_str, {hex_src_string} );
 
-    sha2( src_str, src_len, output, 1 );
+    sha256( src_str, src_len, output, 1 );
     hexify( hash_str, output, 28 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -60,7 +60,7 @@
 
     src_len = unhexify( src_str, {hex_src_string} );
 
-    sha2( src_str, src_len, output, 0 );
+    sha256( src_str, src_len, output, 0 );
     hexify( hash_str, output, 32 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -81,7 +81,7 @@
 
     src_len = unhexify( src_str, {hex_src_string} );
 
-    sha4( src_str, src_len, output, 1 );
+    sha512( src_str, src_len, output, 1 );
     hexify( hash_str, output, 48 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -102,7 +102,7 @@
 
     src_len = unhexify( src_str, {hex_src_string} );
 
-    sha4( src_str, src_len, output, 0);
+    sha512( src_str, src_len, output, 0);
     hexify( hash_str, output, 64 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -134,7 +134,7 @@
     memset(hash_str, 0x00, 57);
     memset(output, 0x00, 29);
 
-    sha2_file( {filename}, output, 1);
+    sha256_file( {filename}, output, 1);
     hexify( hash_str, output, 28 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -150,7 +150,7 @@
     memset(hash_str, 0x00, 65);
     memset(output, 0x00, 33);
 
-    sha2_file( {filename}, output, 0);
+    sha256_file( {filename}, output, 0);
     hexify( hash_str, output, 32 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -166,7 +166,7 @@
     memset(hash_str, 0x00, 97);
     memset(output, 0x00, 49);
 
-    sha4_file( {filename}, output, 1);
+    sha512_file( {filename}, output, 1);
     hexify( hash_str, output, 48 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -182,7 +182,7 @@
     memset(hash_str, 0x00, 129);
     memset(output, 0x00, 65);
 
-    sha4_file( {filename}, output, 0);
+    sha512_file( {filename}, output, 0);
     hexify( hash_str, output, 64 );
 
     TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 );
@@ -197,15 +197,15 @@
 END_CASE
 
 BEGIN_CASE
-sha2_selftest:
+sha256_selftest:
 {
-    TEST_ASSERT( sha2_self_test( 0 ) == 0 );
+    TEST_ASSERT( sha256_self_test( 0 ) == 0 );
 }
 END_CASE
 
 BEGIN_CASE
-sha4_selftest:
+sha512_selftest:
 {
-    TEST_ASSERT( sha4_self_test( 0 ) == 0 );
+    TEST_ASSERT( sha512_self_test( 0 ) == 0 );
 }
 END_CASE