Fixed crypto tests.

diff --git a/winpr/libwinpr/crypto/test/TestCryptoHash.c b/winpr/libwinpr/crypto/test/TestCryptoHash.c
index 71227ee..ffdf3db 100644 (file)
--- a/winpr/libwinpr/crypto/test/TestCryptoHash.c
+++ b/winpr/libwinpr/crypto/test/TestCryptoHash.c
@@ -6,7 +6,7 @@
 static const char* TEST_MD5_DATA = "test";
 static const BYTE* TEST_MD5_HASH = (BYTE*) "\x09\x8f\x6b\xcd\x46\x21\xd3\x73\xca\xde\x4e\x83\x26\x27\xb4\xf6";
 
-BOOL test_crypto_hash_md5()
+static BOOL test_crypto_hash_md5(void)
 {
        BYTE hash[WINPR_MD5_DIGEST_LENGTH];
        WINPR_MD5_CTX ctx;
@@ -31,7 +31,7 @@ BOOL test_crypto_hash_md5()
                free(actual);
                free(expected);
 
-               return -1;
+               return FALSE;
        }
 
        return TRUE;
@@ -40,7 +40,7 @@ BOOL test_crypto_hash_md5()
 static const char* TEST_MD4_DATA = "test";
 static const BYTE* TEST_MD4_HASH = (BYTE*) "\xdb\x34\x6d\x69\x1d\x7a\xcc\x4d\xc2\x62\x5d\xb1\x9f\x9e\x3f\x52";
 
-BOOL test_crypto_hash_md4()
+static BOOL test_crypto_hash_md4(void)
 {
        BYTE hash[WINPR_MD4_DIGEST_LENGTH];
        WINPR_MD4_CTX ctx;
@@ -65,7 +65,7 @@ BOOL test_crypto_hash_md4()
                free(actual);
                free(expected);
 
-               return -1;
+               return FALSE;
        }
 
        return TRUE;
@@ -74,7 +74,7 @@ BOOL test_crypto_hash_md4()
 static const char* TEST_SHA1_DATA = "test";
 static const BYTE* TEST_SHA1_HASH = (BYTE*) "\xa9\x4a\x8f\xe5\xcc\xb1\x9b\xa6\x1c\x4c\x08\x73\xd3\x91\xe9\x87\x98\x2f\xbb\xd3";
 
-BOOL test_crypto_hash_sha1()
+static BOOL test_crypto_hash_sha1(void)
 {
        BYTE hash[WINPR_SHA1_DIGEST_LENGTH];
        WINPR_SHA1_CTX ctx;
@@ -91,15 +91,15 @@ BOOL test_crypto_hash_sha1()
                char* actual;
                char* expected;
 
-               actual = winpr_BinToHexString(hash, WINPR_MD5_DIGEST_LENGTH, FALSE);
-               expected = winpr_BinToHexString(TEST_SHA1_HASH, WINPR_MD5_DIGEST_LENGTH, FALSE);
+               actual = winpr_BinToHexString(hash, WINPR_SHA1_DIGEST_LENGTH, FALSE);
+               expected = winpr_BinToHexString(TEST_SHA1_HASH, WINPR_SHA1_DIGEST_LENGTH, FALSE);
 
                fprintf(stderr, "unexpected SHA1 hash: Actual: %s Expected: %s\n", actual, expected);
 
                free(actual);
                free(expected);
 
-               return -1;
+               return FALSE;
        }
 
        return TRUE;
@@ -109,32 +109,32 @@ static const char* TEST_HMAC_MD5_DATA = "Hi There";
 static const BYTE* TEST_HMAC_MD5_KEY = (BYTE*) "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b";
 static const BYTE* TEST_HMAC_MD5_HASH = (BYTE*) "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d";
 
-BOOL test_crypto_hash_hmac_md5()
+static BOOL test_crypto_hash_hmac_md5(void)
 {
        BYTE hash[WINPR_MD5_DIGEST_LENGTH];
        WINPR_HMAC_CTX ctx;
 
-       if (!winpr_HMAC_Init(&ctx, WINPR_MD_MD5, TEST_HMAC_MD5_KEY, WINPR_SHA1_DIGEST_LENGTH))
+       if (!winpr_HMAC_Init(&ctx, WINPR_MD_MD5, TEST_HMAC_MD5_KEY, WINPR_MD5_DIGEST_LENGTH))
                return FALSE;
        if (!winpr_HMAC_Update(&ctx, (BYTE*) TEST_HMAC_MD5_DATA, strlen(TEST_HMAC_MD5_DATA)))
                return FALSE;
        if (!winpr_HMAC_Final(&ctx, hash, sizeof(hash)))
                return FALSE;
 
-       if (memcmp(hash, TEST_HMAC_MD5_HASH, WINPR_SHA1_DIGEST_LENGTH) != 0)
+       if (memcmp(hash, TEST_HMAC_MD5_HASH, WINPR_MD5_DIGEST_LENGTH) != 0)
        {
                char* actual;
                char* expected;
 
-               actual = winpr_BinToHexString(hash, WINPR_SHA1_DIGEST_LENGTH, FALSE);
-               expected = winpr_BinToHexString(TEST_HMAC_MD5_HASH, WINPR_SHA1_DIGEST_LENGTH, FALSE);
+               actual = winpr_BinToHexString(hash, WINPR_MD5_DIGEST_LENGTH, FALSE);
+               expected = winpr_BinToHexString(TEST_HMAC_MD5_HASH, WINPR_MD5_DIGEST_LENGTH, FALSE);
 
                fprintf(stderr, "unexpected HMAC-MD5 hash: Actual: %s Expected: %s\n", actual, expected);
 
                free(actual);
                free(expected);
 
-               return -1;
+               return FALSE;
        }
 
        return TRUE;
@@ -144,7 +144,7 @@ static const char* TEST_HMAC_SHA1_DATA = "Hi There";
 static const BYTE* TEST_HMAC_SHA1_KEY = (BYTE*) "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b";
 static const BYTE* TEST_HMAC_SHA1_HASH = (BYTE*) "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00";
 
-BOOL test_crypto_hash_hmac_sha1()
+static BOOL test_crypto_hash_hmac_sha1(void)
 {
        BYTE hash[WINPR_SHA1_DIGEST_LENGTH];
        WINPR_HMAC_CTX ctx;
@@ -169,7 +169,7 @@ BOOL test_crypto_hash_hmac_sha1()
                free(actual);
                free(expected);
 
-               return -1;
+               return FALSE;
        }
 
        return TRUE;