2015-01-29 12:29:12 +01:00
|
|
|
|
<?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>
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
|
<RootNamespace>mbedTLS</RootNamespace>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</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>
|
|
|
|
|
</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>
|
2017-03-01 23:25:12 +01:00
|
|
|
|
<IntDir>$(Configuration)\$(TargetName)\</IntDir>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</PropertyGroup>
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
<LinkIncremental>true</LinkIncremental>
|
2017-03-01 23:25:12 +01:00
|
|
|
|
<IntDir>$(Configuration)\$(TargetName)\</IntDir>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</PropertyGroup>
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
|
|
<LinkIncremental>false</LinkIncremental>
|
2017-03-01 23:25:12 +01:00
|
|
|
|
<IntDir>$(Configuration)\$(TargetName)\</IntDir>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</PropertyGroup>
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
<LinkIncremental>false</LinkIncremental>
|
2017-03-01 23:25:12 +01:00
|
|
|
|
<IntDir>$(Configuration)\$(TargetName)\</IntDir>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</PropertyGroup>
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
|
|
<ClCompile>
|
|
|
|
|
<PrecompiledHeader>
|
|
|
|
|
</PrecompiledHeader>
|
|
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
|
|
<Optimization>Disabled</Optimization>
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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>
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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>
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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>
|
Merge mbedtls 2.16.6 into baremetal
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
2020-05-18 17:47:25 +02:00
|
|
|
|
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
|
|
|
|
|
</ClCompile>
|
|
|
|
|
<Link>
|
|
|
|
|
<SubSystem>Windows</SubSystem>
|
|
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
|
|
|
</Link>
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
<ItemGroup>
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\aes.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\aesni.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\arc4.h" />
|
2018-05-09 10:57:04 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\aria.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\asn1.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\asn1write.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\base64.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\bignum.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\blowfish.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\bn_mul.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\camellia.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ccm.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\certs.h" />
|
2018-06-07 13:04:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\chacha20.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\chachapoly.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\check_config.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\cipher.h" />
|
2015-06-25 11:29:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\cipher_internal.h" />
|
2016-10-16 20:34:39 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\cmac.h" />
|
2015-05-14 13:04:03 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\compat-1.3.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\config.h" />
|
2020-08-07 17:34:21 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\crc.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ctr_drbg.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\debug.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\des.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\dhm.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ecdh.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ecdsa.h" />
|
2015-11-04 12:04:00 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ecjpake.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ecp.h" />
|
2017-05-15 16:11:12 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ecp_internal.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\entropy.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\entropy_poll.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\error.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\gcm.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\havege.h" />
|
2016-07-17 09:51:22 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\hkdf.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\hmac_drbg.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\md.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\md2.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\md4.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\md5.h" />
|
2015-06-25 11:29:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\md_internal.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\memory_buffer_alloc.h" />
|
2016-10-16 20:34:39 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\net.h" />
|
2016-09-14 15:32:09 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\net_sockets.h" />
|
2018-07-15 08:29:47 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\nist_kw.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\oid.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\padlock.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pem.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pk.h" />
|
2015-06-25 11:29:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pk_internal.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pkcs11.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pkcs12.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\pkcs5.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\platform.h" />
|
2016-10-16 20:34:39 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\platform_time.h" />
|
2018-04-17 17:03:44 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\platform_util.h" />
|
2018-06-07 13:04:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\poly1305.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ripemd160.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\rsa.h" />
|
2018-01-10 11:35:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\rsa_internal.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\sha1.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\sha256.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\sha512.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl_cache.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl_ciphersuites.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl_cookie.h" />
|
2015-06-25 11:29:35 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl_internal.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\ssl_ticket.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\threading.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\timing.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\version.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\x509.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\x509_crl.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\x509_crt.h" />
|
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\x509_csr.h" />
|
2019-05-02 17:16:46 +02:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\x509_internal.h" />
|
2015-03-09 18:05:11 +01:00
|
|
|
|
<ClInclude Include="..\..\include\mbedtls\xtea.h" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
</ItemGroup>
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
<ClCompile Include="..\..\library\aes.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\aesni.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\arc4.c" />
|
2018-05-09 10:57:04 +02:00
|
|
|
|
<ClCompile Include="..\..\library\aria.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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" />
|
2018-06-07 13:04:35 +02:00
|
|
|
|
<ClCompile Include="..\..\library\chacha20.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\chachapoly.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<ClCompile Include="..\..\library\cipher.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\cipher_wrap.c" />
|
2016-10-16 20:34:39 +02:00
|
|
|
|
<ClCompile Include="..\..\library\cmac.c" />
|
2020-08-07 17:34:21 +02:00
|
|
|
|
<ClCompile Include="..\..\library\crc.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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" />
|
2015-11-04 12:04:00 +01:00
|
|
|
|
<ClCompile Include="..\..\library\ecjpake.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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" />
|
2016-07-17 09:51:22 +02:00
|
|
|
|
<ClCompile Include="..\..\library\hkdf.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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\memory_buffer_alloc.c" />
|
2016-09-14 15:32:09 +02:00
|
|
|
|
<ClCompile Include="..\..\library\net_sockets.c" />
|
2018-07-15 08:29:47 +02:00
|
|
|
|
<ClCompile Include="..\..\library\nist_kw.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<ClCompile Include="..\..\library\oid.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\padlock.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\pem.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\pk.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" />
|
2018-04-17 17:03:44 +02:00
|
|
|
|
<ClCompile Include="..\..\library\platform_util.c" />
|
2018-06-07 13:04:35 +02:00
|
|
|
|
<ClCompile Include="..\..\library\poly1305.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<ClCompile Include="..\..\library\ripemd160.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\rsa.c" />
|
2018-01-10 11:35:11 +01:00
|
|
|
|
<ClCompile Include="..\..\library\rsa_internal.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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_cookie.c" />
|
|
|
|
|
<ClCompile Include="..\..\library\ssl_srv.c" />
|
2015-06-25 11:29:35 +02:00
|
|
|
|
<ClCompile Include="..\..\library\ssl_ticket.c" />
|
2015-01-29 12:29:12 +01:00
|
|
|
|
<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\xtea.c" />
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
|
|
<ImportGroup Label="ExtensionTargets">
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
</Project>
|