tests: Move ms_funcs test cases into hwsim framework

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

diff --git a/src/crypto/crypto_module_tests.c b/src/crypto/crypto_module_tests.c
index a757c48580a176925cbc56fe1bf51fa505a14574..5b76fce7fe4d291a1521974891328c5cc1baa440 100644 (file)
--- a/src/crypto/crypto_module_tests.c
+++ b/src/crypto/crypto_module_tests.c
@@ -12,6 +12,7 @@
 #include "crypto/aes_siv.h"
 #include "crypto/aes_wrap.h"
 #include "crypto/aes.h"
+#include "crypto/ms_funcs.h"
 
 
 static int test_siv(void)
@@ -726,6 +727,103 @@ static int test_key_wrap(void)
 }
 
 
+static int test_ms_funcs(void)
+{
+       /* Test vector from RFC2759 example */
+       char *username = "User";
+       char *password = "clientPass";
+       u8 auth_challenge[] = {
+               0x5B, 0x5D, 0x7C, 0x7D, 0x7B, 0x3F, 0x2F, 0x3E,
+               0x3C, 0x2C, 0x60, 0x21, 0x32, 0x26, 0x26, 0x28
+       };
+       u8 peer_challenge[] = {
+               0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A,
+               0x28, 0x29, 0x5F, 0x2B, 0x3A, 0x33, 0x7C, 0x7E
+       };
+       u8 password_hash[] = {
+               0x44, 0xEB, 0xBA, 0x8D, 0x53, 0x12, 0xB8, 0xD6,
+               0x11, 0x47, 0x44, 0x11, 0xF5, 0x69, 0x89, 0xAE
+       };
+       u8 nt_response[] = {
+               0x82, 0x30, 0x9E, 0xCD, 0x8D, 0x70, 0x8B, 0x5E,
+               0xA0, 0x8F, 0xAA, 0x39, 0x81, 0xCD, 0x83, 0x54,
+               0x42, 0x33, 0x11, 0x4A, 0x3D, 0x85, 0xD6, 0xDF
+       };
+       u8 password_hash_hash[] = {
+               0x41, 0xC0, 0x0C, 0x58, 0x4B, 0xD2, 0xD9, 0x1C,
+               0x40, 0x17, 0xA2, 0xA1, 0x2F, 0xA5, 0x9F, 0x3F
+       };
+       u8 authenticator_response[] = {
+               0x40, 0x7A, 0x55, 0x89, 0x11, 0x5F, 0xD0, 0xD6,
+               0x20, 0x9F, 0x51, 0x0F, 0xE9, 0xC0, 0x45, 0x66,
+               0x93, 0x2C, 0xDA, 0x56
+       };
+       u8 master_key[] = {
+               0xFD, 0xEC, 0xE3, 0x71, 0x7A, 0x8C, 0x83, 0x8C,
+               0xB3, 0x88, 0xE5, 0x27, 0xAE, 0x3C, 0xDD, 0x31
+       };
+       u8 send_start_key[] = {
+               0x8B, 0x7C, 0xDC, 0x14, 0x9B, 0x99, 0x3A, 0x1B,
+               0xA1, 0x18, 0xCB, 0x15, 0x3F, 0x56, 0xDC, 0xCB
+       };
+       u8 buf[32];
+       int errors = 0;
+
+       if (nt_password_hash((u8 *) password, os_strlen(password), buf) ||
+           os_memcmp(password_hash, buf, sizeof(password_hash)) != 0) {
+               wpa_printf(MSG_ERROR, "nt_password_hash failed");
+               errors++;
+       }
+
+       if (generate_nt_response(auth_challenge, peer_challenge,
+                                (u8 *) username, os_strlen(username),
+                                (u8 *) password, os_strlen(password), buf) ||
+           os_memcmp(nt_response, buf, sizeof(nt_response)) != 0) {
+               wpa_printf(MSG_ERROR, "generate_nt_response failed");
+               errors++;
+       }
+
+       if (hash_nt_password_hash(password_hash, buf) ||
+           os_memcmp(password_hash_hash, buf,
+                     sizeof(password_hash_hash)) != 0) {
+               wpa_printf(MSG_ERROR, "hash_nt_password_hash failed");
+               errors++;
+       }
+
+       if (generate_authenticator_response((u8 *) password,
+                                           os_strlen(password),
+                                           peer_challenge, auth_challenge,
+                                           (u8 *) username,
+                                           os_strlen(username),
+                                           nt_response, buf) ||
+           os_memcmp(authenticator_response, buf,
+                     sizeof(authenticator_response)) != 0) {
+               wpa_printf(MSG_ERROR, "generate_authenticator_response failed");
+               errors++;
+       }
+
+       if (get_master_key(password_hash_hash, nt_response, buf) ||
+           os_memcmp(master_key, buf, sizeof(master_key)) != 0) {
+               wpa_printf(MSG_ERROR, "get_master_key failed");
+               errors++;
+       }
+
+       if (get_asymetric_start_key(master_key, buf, sizeof(send_start_key),
+                                   1, 1) ||
+           os_memcmp(send_start_key, buf, sizeof(send_start_key)) != 0) {
+               wpa_printf(MSG_ERROR, "get_asymetric_start_key failed");
+               errors++;
+       }
+
+       if (errors)
+               wpa_printf(MSG_ERROR, "ms_funcs: %d errors", errors);
+       else
+               wpa_printf(MSG_INFO, "ms_funcs test cases passed");
+
+       return errors;
+}
+
+
 int crypto_module_tests(void)
 {
        int ret = 0;
@@ -736,7 +834,8 @@ int crypto_module_tests(void)
            test_eax() ||
            test_cbc() ||
            test_ecb() ||
-           test_key_wrap())
+           test_key_wrap() ||
+           test_ms_funcs())
                ret = -1;
 
        return ret;

diff --git a/tests/Makefile b/tests/Makefile
index 9877bb01c1ed0add64054b638fc7108e2335f3ce..b642651037b44b09cf1d8d81154bbcb78c1eebd7 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-TESTS=test-base64 test-md4 test-md5 test-milenage test-ms_funcs \
+TESTS=test-base64 test-md4 test-md5 test-milenage \
        test-rsa-sig-ver \
        test-sha1 \
        test-sha256 test-aes test-asn1 test-x509 test-x509v3 test-list test-rc4
@@ -65,9 +65,6 @@ test-md5: test-md5.o $(LIBS)
 test-milenage: test-milenage.o $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
 
-test-ms_funcs: test-ms_funcs.o $(LIBS)
-       $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
-
 test-rc4: test-rc4.o $(LIBS)
        $(LDO) $(LDFLAGS) -o $@ $^ $(LLIBS)
 

diff --git a/tests/test-ms_funcs.c b/tests/test-ms_funcs.c
deleted file mode 100644 (file)
index b740bc9..0000000
--- a/tests/test-ms_funcs.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Test program for ms_funcs
- * Copyright (c) 2003-2006, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "crypto/ms_funcs.c"
-
-
-int main(int argc, char *argv[])
-{
-       /* Test vector from RFC2759 example */
-       char *username = "User";
-       char *password = "clientPass";
-       u8 auth_challenge[] = {
-               0x5B, 0x5D, 0x7C, 0x7D, 0x7B, 0x3F, 0x2F, 0x3E,
-               0x3C, 0x2C, 0x60, 0x21, 0x32, 0x26, 0x26, 0x28
-       };
-       u8 peer_challenge[] = {
-               0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A,
-               0x28, 0x29, 0x5F, 0x2B, 0x3A, 0x33, 0x7C, 0x7E
-       };
-       u8 challenge[] = { 0xD0, 0x2E, 0x43, 0x86, 0xBC, 0xE9, 0x12, 0x26 };
-       u8 password_hash[] = {
-               0x44, 0xEB, 0xBA, 0x8D, 0x53, 0x12, 0xB8, 0xD6,
-               0x11, 0x47, 0x44, 0x11, 0xF5, 0x69, 0x89, 0xAE
-       };
-       u8 nt_response[] = {
-               0x82, 0x30, 0x9E, 0xCD, 0x8D, 0x70, 0x8B, 0x5E,
-               0xA0, 0x8F, 0xAA, 0x39, 0x81, 0xCD, 0x83, 0x54,
-               0x42, 0x33, 0x11, 0x4A, 0x3D, 0x85, 0xD6, 0xDF
-       };
-       u8 password_hash_hash[] = {
-               0x41, 0xC0, 0x0C, 0x58, 0x4B, 0xD2, 0xD9, 0x1C,
-               0x40, 0x17, 0xA2, 0xA1, 0x2F, 0xA5, 0x9F, 0x3F
-       };
-       u8 authenticator_response[] = {
-               0x40, 0x7A, 0x55, 0x89, 0x11, 0x5F, 0xD0, 0xD6,
-               0x20, 0x9F, 0x51, 0x0F, 0xE9, 0xC0, 0x45, 0x66,
-               0x93, 0x2C, 0xDA, 0x56
-       };
-       u8 master_key[] = {
-               0xFD, 0xEC, 0xE3, 0x71, 0x7A, 0x8C, 0x83, 0x8C,
-               0xB3, 0x88, 0xE5, 0x27, 0xAE, 0x3C, 0xDD, 0x31
-       };
-       u8 send_start_key[] = {
-               0x8B, 0x7C, 0xDC, 0x14, 0x9B, 0x99, 0x3A, 0x1B,
-               0xA1, 0x18, 0xCB, 0x15, 0x3F, 0x56, 0xDC, 0xCB
-       };
-       u8 buf[32];
-
-       int errors = 0;
-
-       printf("Testing ms_funcs.c\n");
-
-       if (challenge_hash(peer_challenge, auth_challenge,
-                          (u8 *) username, strlen(username),
-                          buf) ||
-           memcmp(challenge, buf, sizeof(challenge)) != 0) {
-               printf("challenge_hash failed\n");
-               errors++;
-       }
-
-       if (nt_password_hash((u8 *) password, strlen(password), buf) ||
-           memcmp(password_hash, buf, sizeof(password_hash)) != 0) {
-               printf("nt_password_hash failed\n");
-               errors++;
-       }
-
-       if (generate_nt_response(auth_challenge, peer_challenge,
-                                (u8 *) username, strlen(username),
-                                (u8 *) password, strlen(password),
-                                buf) ||
-           memcmp(nt_response, buf, sizeof(nt_response)) != 0) {
-               printf("generate_nt_response failed\n");
-               errors++;
-       }
-
-       if (hash_nt_password_hash(password_hash, buf) ||
-           memcmp(password_hash_hash, buf, sizeof(password_hash_hash)) != 0) {
-               printf("hash_nt_password_hash failed\n");
-               errors++;
-       }
-
-       if (generate_authenticator_response((u8 *) password, strlen(password),
-                                           peer_challenge, auth_challenge,
-                                           (u8 *) username, strlen(username),
-                                           nt_response, buf) ||
-           memcmp(authenticator_response, buf, sizeof(authenticator_response))
-           != 0) {
-               printf("generate_authenticator_response failed\n");
-               errors++;
-       }
-
-       if (get_master_key(password_hash_hash, nt_response, buf) ||
-           memcmp(master_key, buf, sizeof(master_key)) != 0) {
-               printf("get_master_key failed\n");
-               errors++;
-       }
-
-       if (get_asymetric_start_key(master_key, buf, sizeof(send_start_key),
-                                   1, 1) ||
-           memcmp(send_start_key, buf, sizeof(send_start_key)) != 0) {
-               printf("get_asymetric_start_key failed\n");
-               errors++;
-       }
-
-       if (errors)
-               printf("FAILED! %d errors\n", errors);
-
-       return errors;
-}