new multi_test

testprof/makefile

@@ -20,7 +20,7 @@ endif
 OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o file_test.o             \
 dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o       \
 store_test.o rotate_test.o test_driver.o x86_prof.o katja_test.o dh_test.o               \
-pkcs_1_pss_test.o pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o
+pkcs_1_pss_test.o pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o multi_test.o
 
 ifndef LIBTEST_S
    LIBTEST_S=libtomcrypt_prof.a

testprof/makefile.icc

@@ -4,7 +4,7 @@ CC?=icc
 OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o file_test.o             \
 dsa_test.o ecc_test.o mac_test.o modes_test.o pkcs_1_test.o rsa_test.o                   \
 store_test.o rotate_test.o test_driver.o x86_prof.o katja_test.o dh_test.o misc_test.o   \
-pkcs_1_pss_test.o pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o
+pkcs_1_pss_test.o pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o multi_test.o
 
 ifndef LIBTEST_S
    LIBTEST_S = libtomcrypt_prof.a

testprof/makefile.mingw

@@ -7,7 +7,7 @@ CFLAGS = $(CFLAGS_OPTS) -I../src/headers -I../../libtommath -I. -Wall -Wextra -D
 OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o file_test.o             \
 dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o       \
 store_test.o rotate_test.o test_driver.o x86_prof.o katja_test.o dh_test.o pkcs_1_pss_test.o \
-pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o
+pkcs_1_oaep_test.o pkcs_1_emsa_test.o pkcs_1_eme_test.o multi_test.o
 
 default: $(LIBTEST_S)
 

testprof/makefile.msvc

@@ -4,7 +4,7 @@ OBJECTS=base64_test.obj cipher_hash_test.obj der_tests.obj no_prng.obj file_test
 dsa_test.obj ecc_test.obj mac_test.obj modes_test.obj pkcs_1_test.obj \
 rsa_test.obj store_test.obj rotate_test.obj test_driver.obj x86_prof.obj katja_test.obj \
 dh_test.obj misc_test.obj pkcs_1_pss_test.obj pkcs_1_oaep_test.obj \
-pkcs_1_emsa_test.obj pkcs_1_eme_test.obj
+pkcs_1_emsa_test.obj pkcs_1_eme_test.obj multi_test.obj
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $< /Fo$@

testprof/multi_test.c

@@ -1,7 +1,7 @@
 /* test the multi helpers... */
-#include <tomcrypt.h>
+#include <tomcrypt_test.h>
 
-int main(void)
+int multi_test(void)
 {
    unsigned char key[32], buf[2][MAXBLOCKSIZE];
    unsigned long len, len2;
@@ -17,19 +17,19 @@ int main(void)
    hash_memory_multi(find_hash("sha256"), buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    hash_memory_multi(find_hash("sha256"), buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL, 0);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    hash_memory_multi(find_hash("sha256"), buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 
 #ifdef LTC_HMAC
@@ -39,19 +39,19 @@ int main(void)
    hmac_memory_multi(find_hash("sha256"), key, 16, buf[1], &len2, (unsigned char*)"hello", 5UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    hmac_memory_multi(find_hash("sha256"), key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    hmac_memory_multi(find_hash("sha256"), key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -62,19 +62,19 @@ int main(void)
    omac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"hello", 5UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    omac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    omac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -85,19 +85,19 @@ int main(void)
    pmac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    pmac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    pmac_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -108,19 +108,19 @@ int main(void)
    xcbc_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    xcbc_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    xcbc_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -131,19 +131,19 @@ int main(void)
    f9_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    f9_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    f9_memory_multi(find_cipher("aes"), key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -158,19 +158,19 @@ int main(void)
    poly1305_memory_multi(key, 32, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    poly1305_memory_multi(key, 32, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = sizeof(buf[0]);
    poly1305_memory_multi(key, 32, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -181,19 +181,19 @@ int main(void)
    blake2smac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = 32;
    blake2smac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = 32;
    blake2smac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
@@ -204,27 +204,21 @@ int main(void)
    blake2bmac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"hello", 5, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = 64;
    blake2bmac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"he", 2UL, "llo", 3UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
    len2 = 64;
    blake2bmac_memory_multi(key, 16, buf[1], &len2, (unsigned char*)"h", 1UL, "e", 1UL, "l", 1UL, "l", 1UL, "o", 1UL, NULL);
    if (len != len2 || memcmp(buf[0], buf[1], len)) {
       printf("Failed: %d %lu %lu\n", __LINE__, len, len2);
-      return EXIT_FAILURE;
+      return CRYPT_FAIL_TESTVECTOR;
    }
 #endif
 
-   printf("All passed\n");
-   return EXIT_SUCCESS;
+   return CRYPT_OK;
 }
-
-
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */

testprof/tomcrypt_test.h

@@ -66,6 +66,7 @@ int der_tests(void);
 int misc_test(void);
 int base64_test(void);
 int file_test(void);
+int multi_test(void);
 
 /* timing */
 #define KTIMES  25