[Build-System] Fix MD5 on Windows. Add a unit-test.

diff --git a/tests/unit/switch_core.c b/tests/unit/switch_core.c
index 4c302ea7aa370daccda1ee46277f2fc6bd3e4a72..e51c4e2b1dffeb6bcddbe7e4f2a41921d614b770 100644 (file)
--- a/tests/unit/switch_core.c
+++ b/tests/unit/switch_core.c
@@ -95,6 +95,19 @@ FST_CORE_BEGIN("./conf")
                FST_TEST_END()
 #endif
 
+               FST_TEST_BEGIN(test_md5)
+               {
+                       char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 };
+                       char test_string[] = "test";
+                       switch_status_t status;
+
+                       status = switch_md5_string(digest, (void *)test_string, strlen(test_string));
+
+                       fst_check_int_equals(status, SWITCH_STATUS_SUCCESS);
+                       fst_check_string_equals(digest, "098f6bcd4621d373cade4e832627b4f6");
+               }
+               FST_TEST_END()
+
                FST_TEST_BEGIN(test_switch_event_add_header_leak)
                {
                        switch_event_t* event;

diff --git a/w32/openssl.props b/w32/openssl.props
index c3eaa3632b1a45229528c11e44464c7e99ab08d6..aa31668a75f00b0ce9d97aea2b9f012749ba1c7f 100644 (file)
--- a/w32/openssl.props
+++ b/w32/openssl.props
@@ -68,7 +68,7 @@
       <AdditionalIncludeDirectories>$(OpenSSLLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(OpenSSLLibDir)\include_x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(OpenSSLLibDir)\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENSSL;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;HAVE_OPENSSL_DTLSv1_2_method;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_LIBCRYPTO;OPENSSL;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;HAVE_OPENSSL_DTLSv1_2_method;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>