Merge branch 'development' into dtls

* development: Add missing guards for gnuTLS Prepare for mbed TLS 1.3.10 release Fix potential timing issue in RSA pms handling Conflicts: ChangeLog doxygen/input/doc_mainpage.h doxygen/mbedtls.doxyfile include/polarssl/version.h library/CMakeLists.txt library/ssl_srv.c tests/suites/test_suite_version.data visualc/VS2010/mbedTLS.vcxproj visualc/VS6/mbedtls.dsp visualc/VS6/mbedtls.dsw
2024-11-22 12:35:40 +01:00 · 2015-02-09 11:42:40 +00:00 · 2015-02-09 11:42:40 +00:00 · f7d2bbaa62
commit f7d2bbaa62
parent 4eaf8f02bb 539d972a25
54 changed files with 795 additions and 2304 deletions
--- a/9
+++ b/9
@ -1,4 +1,4 @@
-PolarSSL ChangeLog (Sorted per branch, date)
+mbed TLS ChangeLog (Sorted per branch, date)

 = PolarSSL 1.4.0 (DTLS branch) released 2014-10-22
 Features
@ -10,10 +10,8 @@ API Changes
   * ssl_set_bio() now requires that p_send == p_recv.
   * ssl_set_bio() is deprecated in favor of ssl_set_bio_timeout().

-= 1.3 branch
-
-Reminder: bump SONAME for ABI change (FALLBACK_SCSV, session-hash, EtM)

+= mbed TLS 1.3.10 released 2015-02-09
 Security
   * NULL pointer dereference in the buffer-based allocator when the buffer is
     full and polarssl_free() is called (found by Mark Hasemeyer)
@ -28,6 +26,9 @@ Security
   * Fix potential stack overflow while parsing crafted X.509 certificates
     (TLS server is not affected if it doesn't ask for a client certificate)
     (found using Codenomicon Defensics).
+   * Fix timing difference that could theoretically lead to a
+     Bleichenbacher-style attack in the RSA and RSA-PSK key exchanges
+     (reported by Sebastian Schinzel).

 Features
   * Add support for FALLBACK_SCSV (draft-ietf-tls-downgrade-scsv).
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@ -3218,6 +3218,10 @@ static int ssl_parse_encrypted_pms( ssl_context *ssl,
    size_t len = pk_get_len( ssl_own_key( ssl ) );
    unsigned char *pms = ssl->handshake->premaster + pms_offset;
    unsigned char ver[2];
+    unsigned char fake_pms[48], peer_pms[48];
+    unsigned char mask;
+    unsigned int uret;
+    size_t i;

    if( ! pk_can_do( ssl_own_key( ssl ), POLARSSL_PK_RSA ) )
    {
@ -3250,32 +3254,47 @@ static int ssl_parse_encrypted_pms( ssl_context *ssl,
    ssl_write_version( ssl->handshake->max_major_ver,
                       ssl->handshake->max_minor_ver,
                       ssl->transport, ver );
+    /*
+     * Protection against Bleichenbacher's attack: invalid PKCS#1 v1.5 padding
+     * must not cause the connection to end immediately; instead, send a
+     * bad_record_mac later in the handshake.
+     * Also, avoid data-dependant branches here to protect against
+     * timing-based variants.
+     */
+    ret = ssl->f_rng( ssl->p_rng, fake_pms, sizeof( fake_pms ) );
+    if( ret != 0 )
+        return( ret );

    ret = pk_decrypt( ssl_own_key( ssl ), p, len,
-                      pms, &ssl->handshake->pmslen,
-                      sizeof( ssl->handshake->premaster ) - pms_offset,
+                      peer_pms, &ssl->handshake->pmslen,
+                      sizeof( peer_pms ),
                      ssl->f_rng, ssl->p_rng );

-    if( ret != 0 || ssl->handshake->pmslen != 48 ||
-        pms[0] != ver[0] ||
-        pms[1] != ver[1] )
-    {
+    ret |= ssl->handshake->pmslen - 48;
+    ret |= peer_pms[0] - ver[0];
+    ret |= peer_pms[1] - ver[1];
+
+#if defined(POLARSSL_SSL_DEBUG_ALL)
+    if( ret != 0 )
        SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
+#endif

-        /*
-         * Protection against Bleichenbacher's attack:
-         * invalid PKCS#1 v1.5 padding must not cause
-         * the connection to end immediately; instead,
-         * send a bad_record_mac later in the handshake.
-         */
-        ssl->handshake->pmslen = 48;
-
-        ret = ssl->f_rng( ssl->p_rng, pms, ssl->handshake->pmslen );
-        if( ret != 0 )
-            return( ret );
+    if( sizeof( ssl->handshake->premaster ) < pms_offset ||
+        sizeof( ssl->handshake->premaster ) - pms_offset < 48 )
+    {
+        SSL_DEBUG_MSG( 1, ( "should never happen" ) );
+        return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
    }
+    ssl->handshake->pmslen = 48;

-    return( ret );
+    uret = (unsigned) ret;
+    uret |= -uret; /* msb = ( ret != 0 ) */
+    uret >>= 8 * sizeof( uret ) - 1; /* uret = ( ret != 0 ) */
+    mask = (unsigned char)( -uret ) ; /* ret ? 0xff : 0x00 */
+    for( i = 0; i < ssl->handshake->pmslen; i++ )
+        pms[i] = ( mask & fake_pms[i] ) | ( (~mask) & peer_pms[i] );
+
+    return( 0 );
 }
 #endif /* POLARSSL_KEY_EXCHANGE_RSA_ENABLED ||
          POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED */
--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@ -33,7 +33,7 @@
 #if defined(POLARSSL_ERROR_C)

 HEADER_INCLUDED
-
+#include <stdio.h>
 #include <string.h>

 #if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@ -1391,6 +1391,7 @@ run_test    "Renegotiation: openssl server, client-initiated" \
            -C "error" \
            -c "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renegotiation: gnutls server strict, client-initiated" \
            "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \
@ -1402,6 +1403,7 @@ run_test    "Renegotiation: gnutls server strict, client-initiated" \
            -C "error" \
            -c "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-initiated default" \
            "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1" \
@ -1413,6 +1415,7 @@ run_test    "Renegotiation: gnutls server unsafe, client-initiated default" \
            -c "error" \
            -C "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-inititated no legacy" \
            "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \
@ -1425,6 +1428,7 @@ run_test    "Renegotiation: gnutls server unsafe, client-inititated no legacy" \
            -c "error" \
            -C "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renegotiation: gnutls server unsafe, client-inititated legacy" \
            "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3 exchanges=1 renegotiation=1 renegotiate=1 \
@ -1477,6 +1481,7 @@ run_test    "Renegotiation: DTLS, gnutls server, client-initiated" \

 # Test for the "secure renegotation" extension only (no actual renegotiation)

+requires_gnutls
 run_test    "Renego ext: gnutls server strict, client default" \
            "$G_SRV --priority=NORMAL:%SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3" \
@ -1485,6 +1490,7 @@ run_test    "Renego ext: gnutls server strict, client default" \
            -C "error" \
            -c "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renego ext: gnutls server unsafe, client default" \
            "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3" \
@ -1493,6 +1499,7 @@ run_test    "Renego ext: gnutls server unsafe, client default" \
            -C "error" \
            -c "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renego ext: gnutls server unsafe, client break legacy" \
            "$G_SRV --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
            "$P_CLI debug_level=3 allow_legacy=-1" \
@ -1501,6 +1508,7 @@ run_test    "Renego ext: gnutls server unsafe, client break legacy" \
            -c "error" \
            -C "HTTP/1.0 200 [Oo][Kk]"

+requires_gnutls
 run_test    "Renego ext: gnutls client strict, server default" \
            "$P_SRV debug_level=3" \
            "$G_CLI --priority=NORMAL:%SAFE_RENEGOTIATION" \
@ -1508,6 +1516,7 @@ run_test    "Renego ext: gnutls client strict, server default" \
            -s "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \
            -s "server hello, secure renegotiation extension"

+requires_gnutls
 run_test    "Renego ext: gnutls client unsafe, server default" \
            "$P_SRV debug_level=3" \
            "$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
@ -1515,6 +1524,7 @@ run_test    "Renego ext: gnutls client unsafe, server default" \
            -S "received TLS_EMPTY_RENEGOTIATION_INFO\|found renegotiation extension" \
            -S "server hello, secure renegotiation extension"

+requires_gnutls
 run_test    "Renego ext: gnutls client unsafe, server break legacy" \
            "$P_SRV debug_level=3 allow_legacy=-1" \
            "$G_CLI --priority=NORMAL:%DISABLE_SAFE_RENEGOTIATION" \
--- a/visualc/VS2010/aescrypt2.vcxproj
+++ b/visualc/VS2010/aescrypt2.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A851DBD-7D57-E8F4-85E5-CCA72AEA7DF8}</ProjectGuid>
+    <ProjectGuid>{7A851DBD-7D57-E8F4-85E5-CCA72AEA7DF8}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>aescrypt2</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/benchmark.vcxproj
+++ b/visualc/VS2010/benchmark.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{90EFD9A4-C6B0-3EE8-1F06-0A0E0D55AEDA}</ProjectGuid>
+    <ProjectGuid>{90EFD9A4-C6B0-3EE8-1F06-0A0E0D55AEDA}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>benchmark</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/cert_app.vcxproj
+++ b/visualc/VS2010/cert_app.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4D691D4-137C-CBFA-735B-D46636D7E4D8}</ProjectGuid>
+    <ProjectGuid>{D4D691D4-137C-CBFA-735B-D46636D7E4D8}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>cert_app</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/cert_req.vcxproj
+++ b/visualc/VS2010/cert_req.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C9E2AB15-8AEF-DD48-60C3-557ECC5215BE}</ProjectGuid>
+    <ProjectGuid>{C9E2AB15-8AEF-DD48-60C3-557ECC5215BE}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>cert_req</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/crl_app.vcxproj
+++ b/visualc/VS2010/crl_app.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DB904B85-AD31-B7FB-114F-88760CC485F2}</ProjectGuid>
+    <ProjectGuid>{DB904B85-AD31-B7FB-114F-88760CC485F2}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>crl_app</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/crypt_and_hash.vcxproj
+++ b/visualc/VS2010/crypt_and_hash.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DBB9FC3-6FD6-CA8D-E0FA-35F1E75EFAE7}</ProjectGuid>
+    <ProjectGuid>{5DBB9FC3-6FD6-CA8D-E0FA-35F1E75EFAE7}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>crypt_and_hash</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/dh_client.vcxproj
+++ b/visualc/VS2010/dh_client.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4D29BE4A-979C-C5AE-44B5-30FB37D8D4EE}</ProjectGuid>
+    <ProjectGuid>{4D29BE4A-979C-C5AE-44B5-30FB37D8D4EE}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>dh_client</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/dh_genprime.vcxproj
+++ b/visualc/VS2010/dh_genprime.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{718960D9-5DA6-7B56-39AD-637E81076C71}</ProjectGuid>
+    <ProjectGuid>{718960D9-5DA6-7B56-39AD-637E81076C71}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>dh_genprime</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/dh_server.vcxproj
+++ b/visualc/VS2010/dh_server.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8D91B804-E2CE-142D-8E06-FBB037ED1F65}</ProjectGuid>
+    <ProjectGuid>{8D91B804-E2CE-142D-8E06-FBB037ED1F65}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>dh_server</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/dtls_client.vcxproj
+++ b/visualc/VS2010/dtls_client.vcxproj
@ -22,12 +22,12 @@
    <ClCompile Include="..\..\programs\ssl\dtls_client.c" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
+    <ProjectReference Include="mbedTLS.vcxproj">
      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F8E1C9AD-5DE7-E71C-B840-FC77D1DB2943}</ProjectGuid>
+    <ProjectGuid>{FE7AB78F-DBF1-0721-3522-0D7C3011D2E5}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>dtls_client</RootNamespace>
  </PropertyGroup>
@ -96,7 +96,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -116,7 +116,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -140,7 +140,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--- a/visualc/VS2010/dtls_server.vcxproj
+++ b/visualc/VS2010/dtls_server.vcxproj
@ -22,12 +22,12 @@
    <ClCompile Include="..\..\programs\ssl\dtls_server.c" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
+    <ProjectReference Include="mbedTLS.vcxproj">
      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{25FEA939-437B-99C7-D11B-4814FB67426B}</ProjectGuid>
+    <ProjectGuid>{BFE89EAA-D98B-34E1-C5A4-4080F6FFE317}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>dtls_server</RootNamespace>
  </PropertyGroup>
@ -96,7 +96,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -116,7 +116,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -140,7 +140,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--- a/visualc/VS2010/gen_entropy.vcxproj
+++ b/visualc/VS2010/gen_entropy.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DE695064-13C3-18B0-378D-8B22672BF3F4}</ProjectGuid>
+    <ProjectGuid>{DE695064-13C3-18B0-378D-8B22672BF3F4}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>gen_entropy</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/gen_key.vcxproj
+++ b/visualc/VS2010/gen_key.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BF782A50-E9AE-00CC-C28A-C9DA8AAB4D52}</ProjectGuid>
+    <ProjectGuid>{BF782A50-E9AE-00CC-C28A-C9DA8AAB4D52}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>gen_key</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/gen_random_ctr_drbg.vcxproj
+++ b/visualc/VS2010/gen_random_ctr_drbg.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5FCC71F6-FF33-EBCF-FBA2-8FC783D5318E}</ProjectGuid>
+    <ProjectGuid>{5FCC71F6-FF33-EBCF-FBA2-8FC783D5318E}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>gen_random_ctr_drbg</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/gen_random_havege.vcxproj
+++ b/visualc/VS2010/gen_random_havege.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{71257802-BBCA-99F5-E9D2-905738F30893}</ProjectGuid>
+    <ProjectGuid>{71257802-BBCA-99F5-E9D2-905738F30893}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>gen_random_havege</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/generic_sum.vcxproj
+++ b/visualc/VS2010/generic_sum.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D071CCF7-ACA0-21F8-D382-52A759AEA261}</ProjectGuid>
+    <ProjectGuid>{D071CCF7-ACA0-21F8-D382-52A759AEA261}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>generic_sum</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/hello.vcxproj
+++ b/visualc/VS2010/hello.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B02D4AE1-0218-1CD4-F44E-EFAE19B01B8D}</ProjectGuid>
+    <ProjectGuid>{B02D4AE1-0218-1CD4-F44E-EFAE19B01B8D}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>hello</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/key_app.vcxproj
+++ b/visualc/VS2010/key_app.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{10AE376F-1A70-0297-0216-1FD01AD15D19}</ProjectGuid>
+    <ProjectGuid>{10AE376F-1A70-0297-0216-1FD01AD15D19}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>key_app</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/key_app_writer.vcxproj
+++ b/visualc/VS2010/key_app_writer.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E8ED79F9-8034-1B09-263E-D3F8C4C5C4A8}</ProjectGuid>
+    <ProjectGuid>{E8ED79F9-8034-1B09-263E-D3F8C4C5C4A8}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>key_app_writer</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/mbedTLS.sln
+++ b/visualc/VS2010/mbedTLS.sln
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@ -1,4 +1,3 @@
-<<<<<<< HEAD:visualc/VS2010/PolarSSL.vcxproj
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
@ -22,7 +21,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{46CF2D25-6A36-4189-B59C-E4815388E554}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>PolarSSL</RootNamespace>
+    <RootNamespace>mbedTLS</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -82,7 +81,7 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
      <CompileAs>CompileAsC</CompileAs>
    </ClCompile>
@ -97,7 +96,7 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
      <CompileAs>CompileAsC</CompileAs>
    </ClCompile>
@ -114,7 +113,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -132,7 +131,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;POLARSSL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -285,289 +284,3 @@
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
-=======
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{46CF2D25-6A36-4189-B59C-E4815388E554}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mbedTLS</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\polarssl\aes.h" />
-    <ClInclude Include="..\..\include\polarssl\aesni.h" />
-    <ClInclude Include="..\..\include\polarssl\arc4.h" />
-    <ClInclude Include="..\..\include\polarssl\asn1.h" />
-    <ClInclude Include="..\..\include\polarssl\asn1write.h" />
-    <ClInclude Include="..\..\include\polarssl\base64.h" />
-    <ClInclude Include="..\..\include\polarssl\bignum.h" />
-    <ClInclude Include="..\..\include\polarssl\blowfish.h" />
-    <ClInclude Include="..\..\include\polarssl\bn_mul.h" />
-    <ClInclude Include="..\..\include\polarssl\camellia.h" />
-    <ClInclude Include="..\..\include\polarssl\ccm.h" />
-    <ClInclude Include="..\..\include\polarssl\certs.h" />
-    <ClInclude Include="..\..\include\polarssl\check_config.h" />
-    <ClInclude Include="..\..\include\polarssl\cipher.h" />
-    <ClInclude Include="..\..\include\polarssl\cipher_wrap.h" />
-    <ClInclude Include="..\..\include\polarssl\compat-1.2.h" />
-    <ClInclude Include="..\..\include\polarssl\config.h" />
-    <ClInclude Include="..\..\include\polarssl\ctr_drbg.h" />
-    <ClInclude Include="..\..\include\polarssl\debug.h" />
-    <ClInclude Include="..\..\include\polarssl\des.h" />
-    <ClInclude Include="..\..\include\polarssl\dhm.h" />
-    <ClInclude Include="..\..\include\polarssl\ecdh.h" />
-    <ClInclude Include="..\..\include\polarssl\ecdsa.h" />
-    <ClInclude Include="..\..\include\polarssl\ecp.h" />
-    <ClInclude Include="..\..\include\polarssl\entropy.h" />
-    <ClInclude Include="..\..\include\polarssl\entropy_poll.h" />
-    <ClInclude Include="..\..\include\polarssl\error.h" />
-    <ClInclude Include="..\..\include\polarssl\gcm.h" />
-    <ClInclude Include="..\..\include\polarssl\havege.h" />
-    <ClInclude Include="..\..\include\polarssl\hmac_drbg.h" />
-    <ClInclude Include="..\..\include\polarssl\md.h" />
-    <ClInclude Include="..\..\include\polarssl\md2.h" />
-    <ClInclude Include="..\..\include\polarssl\md4.h" />
-    <ClInclude Include="..\..\include\polarssl\md5.h" />
-    <ClInclude Include="..\..\include\polarssl\md_wrap.h" />
-    <ClInclude Include="..\..\include\polarssl\memory.h" />
-    <ClInclude Include="..\..\include\polarssl\memory_buffer_alloc.h" />
-    <ClInclude Include="..\..\include\polarssl\net.h" />
-    <ClInclude Include="..\..\include\polarssl\oid.h" />
-    <ClInclude Include="..\..\include\polarssl\openssl.h" />
-    <ClInclude Include="..\..\include\polarssl\padlock.h" />
-    <ClInclude Include="..\..\include\polarssl\pbkdf2.h" />
-    <ClInclude Include="..\..\include\polarssl\pem.h" />
-    <ClInclude Include="..\..\include\polarssl\pk.h" />
-    <ClInclude Include="..\..\include\polarssl\pk_wrap.h" />
-    <ClInclude Include="..\..\include\polarssl\pkcs11.h" />
-    <ClInclude Include="..\..\include\polarssl\pkcs12.h" />
-    <ClInclude Include="..\..\include\polarssl\pkcs5.h" />
-    <ClInclude Include="..\..\include\polarssl\platform.h" />
-    <ClInclude Include="..\..\include\polarssl\ripemd160.h" />
-    <ClInclude Include="..\..\include\polarssl\rsa.h" />
-    <ClInclude Include="..\..\include\polarssl\sha1.h" />
-    <ClInclude Include="..\..\include\polarssl\sha256.h" />
-    <ClInclude Include="..\..\include\polarssl\sha512.h" />
-    <ClInclude Include="..\..\include\polarssl\ssl.h" />
-    <ClInclude Include="..\..\include\polarssl\ssl_cache.h" />
-    <ClInclude Include="..\..\include\polarssl\ssl_ciphersuites.h" />
-    <ClInclude Include="..\..\include\polarssl\threading.h" />
-    <ClInclude Include="..\..\include\polarssl\timing.h" />
-    <ClInclude Include="..\..\include\polarssl\version.h" />
-    <ClInclude Include="..\..\include\polarssl\x509.h" />
-    <ClInclude Include="..\..\include\polarssl\x509_crl.h" />
-    <ClInclude Include="..\..\include\polarssl\x509_crt.h" />
-    <ClInclude Include="..\..\include\polarssl\x509_csr.h" />
-    <ClInclude Include="..\..\include\polarssl\xtea.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\library\aes.c" />
-    <ClCompile Include="..\..\library\aesni.c" />
-    <ClCompile Include="..\..\library\arc4.c" />
-    <ClCompile Include="..\..\library\asn1parse.c" />
-    <ClCompile Include="..\..\library\asn1write.c" />
-    <ClCompile Include="..\..\library\base64.c" />
-    <ClCompile Include="..\..\library\bignum.c" />
-    <ClCompile Include="..\..\library\blowfish.c" />
-    <ClCompile Include="..\..\library\camellia.c" />
-    <ClCompile Include="..\..\library\ccm.c" />
-    <ClCompile Include="..\..\library\certs.c" />
-    <ClCompile Include="..\..\library\cipher.c" />
-    <ClCompile Include="..\..\library\cipher_wrap.c" />
-    <ClCompile Include="..\..\library\ctr_drbg.c" />
-    <ClCompile Include="..\..\library\debug.c" />
-    <ClCompile Include="..\..\library\des.c" />
-    <ClCompile Include="..\..\library\dhm.c" />
-    <ClCompile Include="..\..\library\ecdh.c" />
-    <ClCompile Include="..\..\library\ecdsa.c" />
-    <ClCompile Include="..\..\library\ecp.c" />
-    <ClCompile Include="..\..\library\ecp_curves.c" />
-    <ClCompile Include="..\..\library\entropy.c" />
-    <ClCompile Include="..\..\library\entropy_poll.c" />
-    <ClCompile Include="..\..\library\error.c" />
-    <ClCompile Include="..\..\library\gcm.c" />
-    <ClCompile Include="..\..\library\havege.c" />
-    <ClCompile Include="..\..\library\hmac_drbg.c" />
-    <ClCompile Include="..\..\library\md.c" />
-    <ClCompile Include="..\..\library\md2.c" />
-    <ClCompile Include="..\..\library\md4.c" />
-    <ClCompile Include="..\..\library\md5.c" />
-    <ClCompile Include="..\..\library\md_wrap.c" />
-    <ClCompile Include="..\..\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\..\library\net.c" />
-    <ClCompile Include="..\..\library\oid.c" />
-    <ClCompile Include="..\..\library\padlock.c" />
-    <ClCompile Include="..\..\library\pbkdf2.c" />
-    <ClCompile Include="..\..\library\pem.c" />
-    <ClCompile Include="..\..\library\pk.c" />
-    <ClCompile Include="..\..\library\pk_wrap.c" />
-    <ClCompile Include="..\..\library\pkcs11.c" />
-    <ClCompile Include="..\..\library\pkcs12.c" />
-    <ClCompile Include="..\..\library\pkcs5.c" />
-    <ClCompile Include="..\..\library\pkparse.c" />
-    <ClCompile Include="..\..\library\pkwrite.c" />
-    <ClCompile Include="..\..\library\platform.c" />
-    <ClCompile Include="..\..\library\ripemd160.c" />
-    <ClCompile Include="..\..\library\rsa.c" />
-    <ClCompile Include="..\..\library\sha1.c" />
-    <ClCompile Include="..\..\library\sha256.c" />
-    <ClCompile Include="..\..\library\sha512.c" />
-    <ClCompile Include="..\..\library\ssl_cache.c" />
-    <ClCompile Include="..\..\library\ssl_ciphersuites.c" />
-    <ClCompile Include="..\..\library\ssl_cli.c" />
-    <ClCompile Include="..\..\library\ssl_srv.c" />
-    <ClCompile Include="..\..\library\ssl_tls.c" />
-    <ClCompile Include="..\..\library\threading.c" />
-    <ClCompile Include="..\..\library\timing.c" />
-    <ClCompile Include="..\..\library\version.c" />
-    <ClCompile Include="..\..\library\version_features.c" />
-    <ClCompile Include="..\..\library\x509.c" />
-    <ClCompile Include="..\..\library\x509_create.c" />
-    <ClCompile Include="..\..\library\x509_crl.c" />
-    <ClCompile Include="..\..\library\x509_crt.c" />
-    <ClCompile Include="..\..\library\x509_csr.c" />
-    <ClCompile Include="..\..\library\x509write_crt.c" />
-    <ClCompile Include="..\..\library\x509write_csr.c" />
-    <ClCompile Include="..\..\library\xtea.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
->>>>>>> development:visualc/VS2010/mbedTLS.vcxproj
--- a/visualc/VS2010/md5sum.vcxproj
+++ b/visualc/VS2010/md5sum.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{80FE1ECF-6992-A275-7973-E2976718D128}</ProjectGuid>
+    <ProjectGuid>{80FE1ECF-6992-A275-7973-E2976718D128}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>md5sum</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/mpi_demo.vcxproj
+++ b/visualc/VS2010/mpi_demo.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A59FAA0B-9C34-1F99-794D-A365A3AA8CCE}</ProjectGuid>
+    <ProjectGuid>{A59FAA0B-9C34-1F99-794D-A365A3AA8CCE}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>mpi_demo</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/pem2der.vcxproj
+++ b/visualc/VS2010/pem2der.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D3C6FBD6-D78E-7180-8345-5E09B492DBEC}</ProjectGuid>
+    <ProjectGuid>{D3C6FBD6-D78E-7180-8345-5E09B492DBEC}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>pem2der</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/pk_decrypt.vcxproj
+++ b/visualc/VS2010/pk_decrypt.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1EC6CBA3-6187-D456-D9B7-A35399395D71}</ProjectGuid>
+    <ProjectGuid>{1EC6CBA3-6187-D456-D9B7-A35399395D71}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>pk_decrypt</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/pk_encrypt.vcxproj
+++ b/visualc/VS2010/pk_encrypt.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{55007179-7746-9CFB-97EC-65102FB272C8}</ProjectGuid>
+    <ProjectGuid>{55007179-7746-9CFB-97EC-65102FB272C8}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>pk_encrypt</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/pk_sign.vcxproj
+++ b/visualc/VS2010/pk_sign.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F2E8CA55-597F-7FDC-6456-D8650FB970A3}</ProjectGuid>
+    <ProjectGuid>{F2E8CA55-597F-7FDC-6456-D8650FB970A3}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>pk_sign</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/pk_verify.vcxproj
+++ b/visualc/VS2010/pk_verify.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C429B336-1B30-119C-3B34-21A186D6744F}</ProjectGuid>
+    <ProjectGuid>{C429B336-1B30-119C-3B34-21A186D6744F}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>pk_verify</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_decrypt.vcxproj
+++ b/visualc/VS2010/rsa_decrypt.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E0D71D72-8DF4-CCFC-EF60-741EADAB8BF9}</ProjectGuid>
+    <ProjectGuid>{E0D71D72-8DF4-CCFC-EF60-741EADAB8BF9}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_decrypt</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_encrypt.vcxproj
+++ b/visualc/VS2010/rsa_encrypt.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D06CF12E-F222-9273-41BF-B8A052FA5527}</ProjectGuid>
+    <ProjectGuid>{D06CF12E-F222-9273-41BF-B8A052FA5527}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_encrypt</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_genkey.vcxproj
+++ b/visualc/VS2010/rsa_genkey.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F472475C-F677-0E7F-F127-45BF5B64F622}</ProjectGuid>
+    <ProjectGuid>{F472475C-F677-0E7F-F127-45BF5B64F622}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_genkey</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_sign.vcxproj
+++ b/visualc/VS2010/rsa_sign.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{10790F49-6887-AAB6-2D86-BCBD516F8D26}</ProjectGuid>
+    <ProjectGuid>{10790F49-6887-AAB6-2D86-BCBD516F8D26}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_sign</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_sign_pss.vcxproj
+++ b/visualc/VS2010/rsa_sign_pss.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DCD3A1B6-5EC1-8266-93EF-BD2B9BEFE12D}</ProjectGuid>
+    <ProjectGuid>{DCD3A1B6-5EC1-8266-93EF-BD2B9BEFE12D}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_sign_pss</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_verify.vcxproj
+++ b/visualc/VS2010/rsa_verify.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{689E28CF-89ED-BA38-3A14-78A75D891D46}</ProjectGuid>
+    <ProjectGuid>{689E28CF-89ED-BA38-3A14-78A75D891D46}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_verify</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/rsa_verify_pss.vcxproj
+++ b/visualc/VS2010/rsa_verify_pss.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95C50864-854C-2A11-4C91-BCE654E344FB}</ProjectGuid>
+    <ProjectGuid>{95C50864-854C-2A11-4C91-BCE654E344FB}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>rsa_verify_pss</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/selftest.vcxproj
+++ b/visualc/VS2010/selftest.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7DBC5F77-3DA1-5F73-8421-E693D95FC66A}</ProjectGuid>
+    <ProjectGuid>{7DBC5F77-3DA1-5F73-8421-E693D95FC66A}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>selftest</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/sha1sum.vcxproj
+++ b/visualc/VS2010/sha1sum.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E91D12D7-01C0-357F-CAB1-8478B096743C}</ProjectGuid>
+    <ProjectGuid>{E91D12D7-01C0-357F-CAB1-8478B096743C}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>sha1sum</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/sha2sum.vcxproj
+++ b/visualc/VS2010/sha2sum.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8C5CF095-A0A4-54FB-0D48-8DF2B7FE4CA5}</ProjectGuid>
+    <ProjectGuid>{8C5CF095-A0A4-54FB-0D48-8DF2B7FE4CA5}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>sha2sum</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_cert_test.vcxproj
+++ b/visualc/VS2010/ssl_cert_test.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3FE0C0E1-D9BA-6A26-380C-F293E543B914}</ProjectGuid>
+    <ProjectGuid>{3FE0C0E1-D9BA-6A26-380C-F293E543B914}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_cert_test</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_client1.vcxproj
+++ b/visualc/VS2010/ssl_client1.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{487A2F80-3CA3-678D-88D5-82194872CF08}</ProjectGuid>
+    <ProjectGuid>{487A2F80-3CA3-678D-88D5-82194872CF08}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_client1</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_client2.vcxproj
+++ b/visualc/VS2010/ssl_client2.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E590E9D-E28F-87FF-385B-D58736388231}</ProjectGuid>
+    <ProjectGuid>{4E590E9D-E28F-87FF-385B-D58736388231}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_client2</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_fork_server.vcxproj
+++ b/visualc/VS2010/ssl_fork_server.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{918CD402-047D-8467-E11C-E1132053F916}</ProjectGuid>
+    <ProjectGuid>{918CD402-047D-8467-E11C-E1132053F916}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_fork_server</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_mail_client.vcxproj
+++ b/visualc/VS2010/ssl_mail_client.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7C4863A1-941A-C5AE-E1F9-30F062E4B2FD}</ProjectGuid>
+    <ProjectGuid>{7C4863A1-941A-C5AE-E1F9-30F062E4B2FD}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_mail_client</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_server.vcxproj
+++ b/visualc/VS2010/ssl_server.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E08E0065-896A-7487-DEA5-D3B80B71F975}</ProjectGuid>
+    <ProjectGuid>{E08E0065-896A-7487-DEA5-D3B80B71F975}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_server</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_server2.vcxproj
+++ b/visualc/VS2010/ssl_server2.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A4DA7463-1047-BDF5-E1B3-5632CB573F41}</ProjectGuid>
+    <ProjectGuid>{A4DA7463-1047-BDF5-E1B3-5632CB573F41}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_server2</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/ssl_test.vcxproj
+++ b/visualc/VS2010/ssl_test.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DDD0BF0A-779A-DEFD-6A1C-FA2164AE9A34}</ProjectGuid>
+    <ProjectGuid>{DDD0BF0A-779A-DEFD-6A1C-FA2164AE9A34}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>ssl_test</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/strerror.vcxproj
+++ b/visualc/VS2010/strerror.vcxproj
@ -27,7 +27,7 @@
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23EF735C-CC4C-3EC4-A75E-903DB340F04A}</ProjectGuid>
+    <ProjectGuid>{23EF735C-CC4C-3EC4-A75E-903DB340F04A}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>strerror</RootNamespace>
  </PropertyGroup>
--- a/visualc/VS2010/udp_proxy.vcxproj
+++ b/visualc/VS2010/udp_proxy.vcxproj
@ -22,12 +22,12 @@
    <ClCompile Include="..\..\programs\test\udp_proxy.c" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="PolarSSL.vcxproj">
+    <ProjectReference Include="mbedTLS.vcxproj">
      <Project>{46cf2d25-6a36-4189-b59c-e4815388e554}</Project>
    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1F590A67-6E2F-046A-09B6-6FCA1C6B4078}</ProjectGuid>
+    <ProjectGuid>{7E2C80FE-3CC3-82B4-0CAD-65DC233DE13A}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>udp_proxy</RootNamespace>
  </PropertyGroup>
@ -96,7 +96,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -116,7 +116,7 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ShowProgress>NotSet</ShowProgress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
    </Link>
    <ProjectReference>
@ -140,7 +140,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);PolarSSL.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);mbedTLS.lib</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
--- a/visualc/VS6/mbedtls.dsp
+++ b/visualc/VS6/mbedtls.dsp
@ -1,25 +1,24 @@
-<<<<<<< HEAD:visualc/VS6/polarssl.dsp
-# Microsoft Developer Studio Project File - Name="polarssl" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mbedtls" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

-CFG=polarssl - Win32 Debug
+CFG=mbedtls - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "polarssl.mak".
+!MESSAGE NMAKE /f "mbedtls.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "polarssl.mak" CFG="polarssl - Win32 Debug"
+!MESSAGE NMAKE /f "mbedtls.mak" CFG="mbedtls - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "polarssl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "polarssl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "mbedtls - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "mbedtls - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 

 # Begin Project
@ -29,7 +28,7 @@ CFG=polarssl - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == "polarssl - Win32 Release"
+!IF  "$(CFG)" == "mbedtls - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@ -52,7 +51,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo

-!ELSEIF  "$(CFG)" == "polarssl - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mbedtls - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@ -79,8 +78,8 @@ LIB32=link.exe -lib

 # Begin Target

-# Name "polarssl - Win32 Release"
-# Name "polarssl - Win32 Debug"
+# Name "mbedtls - Win32 Release"
+# Name "mbedtls - Win32 Debug"
 # Begin Group "Source Files"

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@ -631,629 +630,3 @@ SOURCE=..\..\include\polarssl\xtea.h
 # End Group
 # End Target
 # End Project
-=======
-# Microsoft Developer Studio Project File - Name="mbedtls" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=mbedtls - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mbedtls.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mbedtls.mak" CFG="mbedtls - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mbedtls - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mbedtls - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mbedtls - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir "temp"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "temp"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "mbedtls - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir "temp"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "temp"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /GX /Z7 /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "mbedtls - Win32 Release"
-# Name "mbedtls - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\library\aes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\aesni.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\arc4.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\asn1parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\asn1write.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\base64.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\bignum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\blowfish.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\camellia.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ccm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\certs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\cipher.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\cipher_wrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ctr_drbg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\des.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\dhm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ecdh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ecdsa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ecp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ecp_curves.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\entropy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\entropy_poll.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\error.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\gcm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\havege.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\hmac_drbg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md4.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md_wrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\memory_buffer_alloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\net.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\oid.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\padlock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pbkdf2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pk.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pk_wrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pkcs11.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pkcs12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pkcs5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pkparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\pkwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\platform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ripemd160.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\rsa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\sha1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\sha256.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\sha512.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ssl_cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ssl_ciphersuites.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ssl_cli.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ssl_srv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\ssl_tls.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\threading.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\timing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\version.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\version_features.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509_crl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509_crt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509_csr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509write_crt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\x509write_csr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\xtea.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\aes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\aesni.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\arc4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\asn1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\asn1write.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\base64.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\bignum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\blowfish.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\bn_mul.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\camellia.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ccm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\certs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\check_config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\cipher.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\cipher_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\compat-1.2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ctr_drbg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\des.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\dhm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ecdh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ecdsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ecp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\entropy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\entropy_poll.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\error.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\gcm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\havege.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\hmac_drbg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md4.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\memory_buffer_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\net.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\oid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\openssl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\padlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pbkdf2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pk_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pkcs11.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pkcs12.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\pkcs5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ripemd160.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\rsa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\sha1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\sha256.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\sha512.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ssl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ssl_cache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\ssl_ciphersuites.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\threading.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\timing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\x509.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\x509_crl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\x509_crt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\x509_csr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\xtea.h
-# End Source File
-# End Group
-# End Target
-# End Project
->>>>>>> development:visualc/VS6/mbedtls.dsp
--- a/visualc/VS6/mbedtls.dsw
+++ b/visualc/VS6/mbedtls.dsw