tests: Add CAVP test vectors for byte-oriented SHA-1 and SHA-256

This allows the SHA-1 implementation to be validated against the
SHA1ShortMsg.rsp and SHA1LongMsg.rsp test vectors from
http://csrc.nist.gov/groups/STM/cavp/documents/shs/shabytetestvectors.zip.
Similarly, the SHA-256 can be validated against the SHA256ShortMsg.rsp
and SHA256LongMsg.rsp.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/tests/test-sha1.c b/tests/test-sha1.c
index 313ae59fd31ee36171abb9ad5d6a43aea2deb1b6..c0aee3896e556cb29eefaccf724246979a055a65 100644 (file)
--- a/tests/test-sha1.c
+++ b/tests/test-sha1.c
@@ -370,6 +370,100 @@ static struct rfc6070_test rfc6070_tests[] =
 #define NUM_RFC6070_TESTS ARRAY_SIZE(rfc6070_tests)
 
 
+static int cavp_shavs(const char *fname)
+{
+       FILE *f;
+       int ret = 0;
+       char buf[15000], *pos, *pos2;
+       u8 msg[6400];
+       int msg_len = 0, tmp_len;
+       u8 md[20], hash[20];
+       int ok = 0;
+
+       printf("CAVP SHAVS test vectors from %s\n", fname);
+
+       f = fopen(fname, "r");
+       if (f == NULL) {
+               printf("%s does not exist - cannot validate CAVP SHAVS test vectors\n",
+                       fname);
+               return 0;
+       }
+
+       while (fgets(buf, sizeof(buf), f)) {
+               pos = os_strchr(buf, '=');
+               if (pos == NULL)
+                       continue;
+               pos2 = pos - 1;
+               while (pos2 >= buf && *pos2 == ' ')
+                       *pos2-- = '\0';
+               *pos++ = '\0';
+               while (*pos == ' ')
+                       *pos++ = '\0';
+               pos2 = os_strchr(pos, '\r');
+               if (!pos2)
+                       pos2 = os_strchr(pos, '\n');
+               if (pos2)
+                       *pos2 = '\0';
+               else
+                       pos2 = pos + os_strlen(pos);
+
+               if (os_strcmp(buf, "Len") == 0) {
+                       msg_len = atoi(pos);
+               } else if (os_strcmp(buf, "Msg") == 0) {
+                       tmp_len = os_strlen(pos);
+                       if (msg_len == 0 && tmp_len == 2)
+                               tmp_len = 0;
+                       if (msg_len != tmp_len * 4) {
+                               printf("Unexpected Msg length (msg_len=%u tmp_len=%u, Msg='%s'\n",
+                                      msg_len, tmp_len, pos);
+                               ret++;
+                               break;
+                       }
+
+                       if (hexstr2bin(pos, msg, msg_len / 8) < 0) {
+                               printf("Invalid hex string '%s'\n", pos);
+                               ret++;
+                               break;
+                       }
+               } else if (os_strcmp(buf, "MD") == 0) {
+                       const u8 *addr[1];
+                       size_t len[1];
+
+                       tmp_len = os_strlen(pos);
+                       if (tmp_len != 2 * 20) {
+                               printf("Unexpected MD length (MD='%s'\n",
+                                      pos);
+                               ret++;
+                               break;
+                       }
+
+                       if (hexstr2bin(pos, md, 20) < 0) {
+                               printf("Invalid hex string '%s'\n", pos);
+                               ret++;
+                               break;
+                       }
+
+                       addr[0] = msg;
+                       len[0] = msg_len / 8;
+                       if (sha1_vector(1, addr, len, hash) < 0 ||
+                           os_memcmp(hash, md, 20) != 0)
+                               ret++;
+                       else
+                               ok++;
+               }
+       }
+
+       fclose(f);
+
+       if (ret)
+               printf("Test case failed\n");
+       else
+               printf("%d test vectors OK\n", ok);
+
+       return ret;
+}
+
+
 int main(int argc, char *argv[])
 {
        u8 res[512];
@@ -436,5 +530,10 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (cavp_shavs("CAVP/SHA1ShortMsg.rsp"))
+               ret++;
+       if (cavp_shavs("CAVP/SHA1LongMsg.rsp"))
+               ret++;
+
        return ret;
 }

diff --git a/tests/test-sha256.c b/tests/test-sha256.c
index 7703aea26c97dfa2d54653fffa60ba2ca6049ce8..ade0f2ed0894655bcc14ac633d13a4f161b64aba 100644 (file)
--- a/tests/test-sha256.c
+++ b/tests/test-sha256.c
@@ -242,6 +242,100 @@ struct hmac_test {
 };
 
 
+static int cavp_shavs(const char *fname)
+{
+       FILE *f;
+       int ret = 0;
+       char buf[15000], *pos, *pos2;
+       u8 msg[6400];
+       int msg_len = 0, tmp_len;
+       u8 md[32], hash[32];
+       int ok = 0;
+
+       printf("CAVP SHAVS test vectors from %s\n", fname);
+
+       f = fopen(fname, "r");
+       if (f == NULL) {
+               printf("%s does not exist - cannot validate CAVP SHAVS test vectors\n",
+                       fname);
+               return 0;
+       }
+
+       while (fgets(buf, sizeof(buf), f)) {
+               pos = os_strchr(buf, '=');
+               if (pos == NULL)
+                       continue;
+               pos2 = pos - 1;
+               while (pos2 >= buf && *pos2 == ' ')
+                       *pos2-- = '\0';
+               *pos++ = '\0';
+               while (*pos == ' ')
+                       *pos++ = '\0';
+               pos2 = os_strchr(pos, '\r');
+               if (!pos2)
+                       pos2 = os_strchr(pos, '\n');
+               if (pos2)
+                       *pos2 = '\0';
+               else
+                       pos2 = pos + os_strlen(pos);
+
+               if (os_strcmp(buf, "Len") == 0) {
+                       msg_len = atoi(pos);
+               } else if (os_strcmp(buf, "Msg") == 0) {
+                       tmp_len = os_strlen(pos);
+                       if (msg_len == 0 && tmp_len == 2)
+                               tmp_len = 0;
+                       if (msg_len != tmp_len * 4) {
+                               printf("Unexpected Msg length (msg_len=%u tmp_len=%u, Msg='%s'\n",
+                                      msg_len, tmp_len, pos);
+                               ret++;
+                               break;
+                       }
+
+                       if (hexstr2bin(pos, msg, msg_len / 8) < 0) {
+                               printf("Invalid hex string '%s'\n", pos);
+                               ret++;
+                               break;
+                       }
+               } else if (os_strcmp(buf, "MD") == 0) {
+                       const u8 *addr[1];
+                       size_t len[1];
+
+                       tmp_len = os_strlen(pos);
+                       if (tmp_len != 2 * 32) {
+                               printf("Unexpected MD length (MD='%s'\n",
+                                      pos);
+                               ret++;
+                               break;
+                       }
+
+                       if (hexstr2bin(pos, md, 32) < 0) {
+                               printf("Invalid hex string '%s'\n", pos);
+                               ret++;
+                               break;
+                       }
+
+                       addr[0] = msg;
+                       len[0] = msg_len / 8;
+                       if (sha256_vector(1, addr, len, hash) < 0 ||
+                           os_memcmp(hash, md, 32) != 0)
+                               ret++;
+                       else
+                               ok++;
+               }
+       }
+
+       fclose(f);
+
+       if (ret)
+               printf("Test case failed\n");
+       else
+               printf("%d test vectors OK\n", ok);
+
+       return ret;
+}
+
+
 int main(int argc, char *argv[])
 {
 
@@ -321,5 +415,10 @@ int main(int argc, char *argv[])
                   hash, sizeof(hash));
        /* TODO: add proper test case for this */
 
+       if (cavp_shavs("CAVP/SHA256ShortMsg.rsp"))
+               errors++;
+       if (cavp_shavs("CAVP/SHA256LongMsg.rsp"))
+               errors++;
+
        return errors;
 }