Use MbedTLS 3.5.1 and Add TLS 1.3 Support to WinSim Demos (#1135)
* Bump up to MBed-TLS V3.5.1, make changes to Visual Studio Projects to account for this. * Update MBedTLS Transport files to call psa_crypto_init() if the MBEDTLS_PSA_CRYPTO_C is set. * Add WIN32_LEAN_AND_MEAN to the corePKCS11_MQTT_Mutual_Auth_Windows_Simulator demo. Add in a check for MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET when making a TLS handshake. * Change transport interface files from using void * to mbedtls_pk_context * instead per changes in the MbedTLS API. * Changes to Fleet Provisioning Demo and Demo Setup to use ECDSA keys * Remove non-32 bit configs from various VisualStudio Projects. Enforce all projects using WIN32_LEAN_AND_MEAN as well as winsock2.hpull/1136/head^2
Soren Ptak
1 year ago
committed by
GitHub
parent
4bad7a6ba4
commit
6b513cb1a2
@ -0,0 +1,199 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
import os
|
||||||
|
import argparse
|
||||||
|
import random
|
||||||
|
import datetime
|
||||||
|
import subprocess
|
||||||
|
from cryptography import x509
|
||||||
|
from cryptography.x509.oid import NameOID
|
||||||
|
from cryptography.hazmat.backends import default_backend
|
||||||
|
from cryptography.hazmat.primitives import serialization, hashes
|
||||||
|
from cryptography.hazmat.primitives.asymmetric import ec
|
||||||
|
|
||||||
|
# Helper scripts from this directory
|
||||||
|
from convert_credentials_to_der import convert_pem_to_der
|
||||||
|
|
||||||
|
script_file_dir_abs_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
|
# File names for generated credentials
|
||||||
|
ROOT_CA_PRIV_KEY_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_root_priv_key.pem"
|
||||||
|
ROOT_CA_PUB_KEY_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_root_pub_key.pem"
|
||||||
|
ROOT_CA_CERT_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_root_ca_cert.pem"
|
||||||
|
|
||||||
|
CLAIM_PRIV_KEY_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_claim_priv_key.pem"
|
||||||
|
CLAIM_PUB_KEY_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_claim_pub_key.pem"
|
||||||
|
CLAIM_CERT_FILE = f"{script_file_dir_abs_path}{os.sep}ECDSA_claim_device_cert.pem"
|
||||||
|
|
||||||
|
# Use the current date and time to create a unique subject name
|
||||||
|
now = datetime.datetime.now()
|
||||||
|
dt_string = now.strftime("%d_%m_%Y_%H_%M_%S")
|
||||||
|
|
||||||
|
# Default values for the CA cert
|
||||||
|
subject = issuer = x509.Name([
|
||||||
|
x509.NameAttribute(NameOID.COUNTRY_NAME, "US"),
|
||||||
|
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "FP_State"),
|
||||||
|
x509.NameAttribute(NameOID.LOCALITY_NAME, "FP_Locality"),
|
||||||
|
x509.NameAttribute(NameOID.ORGANIZATION_NAME, "FP_Organization"),
|
||||||
|
x509.NameAttribute(NameOID.COMMON_NAME, f'FP_CN_{dt_string}'),
|
||||||
|
])
|
||||||
|
|
||||||
|
# Simple check of the generated keys.
|
||||||
|
# Documentation says if the operations fail an exception is thrown.
|
||||||
|
# https://cryptography.io/en/latest/hazmat/primitives/asymmetric/ec/#cryptography.hazmat.primitives.asymmetric.ec.ECDSA
|
||||||
|
def validate_keys(private_key, public_key):
|
||||||
|
# Verify the generated keys work correctly by signing a message and then verifying it
|
||||||
|
data = b"TEST DATA TO SIGN"
|
||||||
|
|
||||||
|
# Sign the above message using the private key
|
||||||
|
signature = private_key.sign(
|
||||||
|
data,
|
||||||
|
ec.ECDSA(hashes.SHA256())
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify the signature using the public key
|
||||||
|
public_key.verify(
|
||||||
|
signature,
|
||||||
|
data,
|
||||||
|
ec.ECDSA(hashes.SHA256())
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def generate_priv_keys_and_certs(write_der_keys):
|
||||||
|
print("Generating ECDSA Root Keys\n")
|
||||||
|
# Generate an ECDSA Key Pair
|
||||||
|
# NOTE: At time of writing corePKCS11 only supports the prime256v1/secp256r1 keys
|
||||||
|
# If this changes then these keys should be changed to use a better alg.
|
||||||
|
root_prv_key = ec.generate_private_key(
|
||||||
|
ec.SECP256R1()
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get the related public key
|
||||||
|
root_pub_key = root_prv_key.public_key()
|
||||||
|
|
||||||
|
validate_keys(
|
||||||
|
private_key = root_prv_key,
|
||||||
|
public_key = root_pub_key
|
||||||
|
)
|
||||||
|
|
||||||
|
# Now that the public and private key have been validated, create a x509 Cert
|
||||||
|
root_ca_cert = x509.CertificateBuilder().subject_name(
|
||||||
|
subject
|
||||||
|
).issuer_name(
|
||||||
|
issuer
|
||||||
|
).public_key(
|
||||||
|
root_pub_key
|
||||||
|
).serial_number(
|
||||||
|
x509.random_serial_number()
|
||||||
|
).not_valid_before(
|
||||||
|
datetime.datetime.now(datetime.timezone.utc)
|
||||||
|
).not_valid_after(
|
||||||
|
# Our certificate will be valid for 14 days
|
||||||
|
datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=14)
|
||||||
|
).add_extension(
|
||||||
|
x509.BasicConstraints(ca=True, path_length=None), critical=True,
|
||||||
|
# Sign our certificate with our private key
|
||||||
|
).sign(root_prv_key, hashes.SHA256())
|
||||||
|
|
||||||
|
# Check to make sure the cert generated correctly
|
||||||
|
isinstance(root_ca_cert, x509.Certificate)
|
||||||
|
|
||||||
|
# Print out the generated ECDSA Keys and Certs
|
||||||
|
root_pub_key_pem = root_pub_key.public_bytes(
|
||||||
|
encoding=serialization.Encoding.PEM,
|
||||||
|
format=serialization.PublicFormat.SubjectPublicKeyInfo
|
||||||
|
)
|
||||||
|
|
||||||
|
root_prv_key_pem = root_prv_key.private_bytes(
|
||||||
|
encoding=serialization.Encoding.PEM,
|
||||||
|
format=serialization.PrivateFormat.TraditionalOpenSSL,
|
||||||
|
encryption_algorithm=serialization.NoEncryption()
|
||||||
|
)
|
||||||
|
|
||||||
|
root_ca_cert_pem = root_ca_cert.public_bytes(serialization.Encoding.PEM)
|
||||||
|
|
||||||
|
print("Public Key Pem:\n{0}\n".format(root_pub_key_pem.decode("utf-8")))
|
||||||
|
print("Private Key Pem:\n{0}\n".format(root_prv_key_pem.decode("utf-8")))
|
||||||
|
print("Root CA Cert Pem:\n{0}\n".format(root_ca_cert_pem.decode("utf-8")))
|
||||||
|
|
||||||
|
open(ROOT_CA_PRIV_KEY_FILE, "wb").write(root_prv_key_pem)
|
||||||
|
open(ROOT_CA_PUB_KEY_FILE, "wb").write(root_pub_key_pem)
|
||||||
|
open(ROOT_CA_CERT_FILE, "wb").write(root_ca_cert_pem)
|
||||||
|
|
||||||
|
print(f"Wrote PEM Encoded Root Private Key to:\n\t{ROOT_CA_PRIV_KEY_FILE}")
|
||||||
|
print(f"Wrote PEM Encoded Root Public Key to:\n\t{ROOT_CA_PUB_KEY_FILE}")
|
||||||
|
print(f"Wrote PEM Encoded Root CA Cert to:\n\t{ROOT_CA_CERT_FILE}")
|
||||||
|
|
||||||
|
# Device credential generation
|
||||||
|
print("\n\nGenerating ECDSA Claim Keys\n")
|
||||||
|
# Generate a ECDSA Key Pair
|
||||||
|
claim_prv_key = ec.generate_private_key(
|
||||||
|
ec.SECP256R1()
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get the related public key
|
||||||
|
claim_pub_key = claim_prv_key.public_key()
|
||||||
|
|
||||||
|
# Simple check of the generated keys
|
||||||
|
validate_keys(
|
||||||
|
private_key = claim_prv_key,
|
||||||
|
public_key = claim_pub_key
|
||||||
|
)
|
||||||
|
|
||||||
|
# Now that the public and private key have been validated, create a x509 Cert
|
||||||
|
claim_cert = x509.CertificateBuilder().subject_name(
|
||||||
|
subject
|
||||||
|
).issuer_name(
|
||||||
|
issuer
|
||||||
|
).public_key(
|
||||||
|
claim_pub_key
|
||||||
|
).serial_number(
|
||||||
|
x509.random_serial_number()
|
||||||
|
).not_valid_before(
|
||||||
|
datetime.datetime.now(datetime.timezone.utc)
|
||||||
|
).not_valid_after(
|
||||||
|
# Our certificate will be valid for 14 days
|
||||||
|
datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=14)
|
||||||
|
).add_extension(
|
||||||
|
x509.BasicConstraints(ca=False, path_length=None), critical=True,
|
||||||
|
# Sign our certificate with the Root private key
|
||||||
|
).sign(root_prv_key, hashes.SHA256())
|
||||||
|
|
||||||
|
# Check to make sure the cert generated correctly
|
||||||
|
isinstance(claim_cert, x509.Certificate)
|
||||||
|
|
||||||
|
# Serialize the generated ECDSA Keys and Certs
|
||||||
|
claim_pub_key_pem = claim_pub_key.public_bytes(
|
||||||
|
encoding=serialization.Encoding.PEM,
|
||||||
|
format=serialization.PublicFormat.SubjectPublicKeyInfo
|
||||||
|
)
|
||||||
|
|
||||||
|
claim_prv_key_pem = claim_prv_key.private_bytes(
|
||||||
|
encoding=serialization.Encoding.PEM,
|
||||||
|
format=serialization.PrivateFormat.TraditionalOpenSSL,
|
||||||
|
encryption_algorithm=serialization.NoEncryption()
|
||||||
|
)
|
||||||
|
|
||||||
|
claim_cert_pem = claim_cert.public_bytes(serialization.Encoding.PEM)
|
||||||
|
|
||||||
|
print("Claim Public Key Pem:\n{0}\n".format(claim_pub_key_pem.decode("utf-8")))
|
||||||
|
print("Claim Private Key Pem:\n{0}\n".format(claim_prv_key_pem.decode("utf-8")))
|
||||||
|
print("Claim Cert Pem:\n{0}\n".format(claim_cert_pem.decode("utf-8")))
|
||||||
|
|
||||||
|
open(CLAIM_PRIV_KEY_FILE, "wb").write(claim_pub_key_pem)
|
||||||
|
open(CLAIM_PUB_KEY_FILE, "wb").write(claim_prv_key_pem)
|
||||||
|
open(CLAIM_CERT_FILE, "wb").write(claim_cert_pem)
|
||||||
|
|
||||||
|
print(f"Wrote PEM Encoded Claim Private Key to:\n\t{CLAIM_PRIV_KEY_FILE}")
|
||||||
|
print(f"Wrote PEM Encoded Claim Public Key to:\n\t{CLAIM_PUB_KEY_FILE}")
|
||||||
|
print(f"Wrote PEM Encoded Claim CA Cert to:\n\t{CLAIM_CERT_FILE}")
|
||||||
|
|
||||||
|
if write_der_keys == True:
|
||||||
|
print("\nWrite DER Format Version of Claim Private Key and Cert")
|
||||||
|
# Use the helper function in convert_credentials_to_der to write out DER formatted keys
|
||||||
|
convert_pem_to_der(
|
||||||
|
cert_pem = claim_cert_pem.decode("utf-8"),
|
||||||
|
key_pem = claim_prv_key_pem.decode("utf-8")
|
||||||
|
)
|
||||||
|
|
||||||
|
return root_ca_cert_pem.decode("utf-8"), claim_cert_pem.decode("utf-8")
|
||||||
@ -1,162 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.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="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{C686325E-3261-42F7-AEB1-DDE5280E1CEB}</ProjectGuid>
|
|
||||||
<ProjectName>RTOSDemo</ProjectName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<PlatformToolset>v142</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<PlatformToolset>v142</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
|
||||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
|
|
||||||
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
|
|
||||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
|
|
||||||
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<Midl>
|
|
||||||
<TypeLibraryName>.\Debug/WIN32.tlb</TypeLibraryName>
|
|
||||||
<HeaderFileName>
|
|
||||||
</HeaderFileName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\FreeRTOS-Plus-CLI;.\Trace_Recorder_Configuration;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<MinimalRebuild>true</MinimalRebuild>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
<PrecompiledHeaderOutputFile>.\Debug/WIN32.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>.\Debug/</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0c09</Culture>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<OutputFile>.\Debug/RTOSDemo.exe</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<ProgramDatabaseFile>.\Debug/WIN32.pdb</ProgramDatabaseFile>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>
|
|
||||||
</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
<Bscmake>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<OutputFile>.\Debug/WIN32.bsc</OutputFile>
|
|
||||||
</Bscmake>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<Midl>
|
|
||||||
<TypeLibraryName>.\Release/WIN32.tlb</TypeLibraryName>
|
|
||||||
<HeaderFileName>
|
|
||||||
</HeaderFileName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
|
||||||
<PreprocessorDefinitions>_WINSOCKAPI_;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<StringPooling>true</StringPooling>
|
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<PrecompiledHeaderOutputFile>.\Release/WIN32.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>.\Release/</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<AdditionalIncludeDirectories>..\Common\Utils;..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap;..\Common\ethernet\lwip-1.4.0\src\include\ipv4;..\Common\ethernet\lwip-1.4.0\src\include;..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\ethernet\lwip-1.4.0\ports\win32\include;..\Common\Include;.\lwIP_Apps;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0c09</Culture>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<OutputFile>.\Release/RTOSDemo.exe</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<ProgramDatabaseFile>.\Release/WIN32.pdb</ProgramDatabaseFile>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<AdditionalLibraryDirectories>..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<Bscmake>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<OutputFile>.\Release/WIN32.bsc</OutputFile>
|
|
||||||
</Bscmake>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_3.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\queue.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\stream_buffer.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c" />
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\timers.c" />
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.c" />
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcKernelPort.c" />
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcSnapshotRecorder.c" />
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcStreamingRecorder.c" />
|
|
||||||
<ClCompile Include="CLI-commands.c" />
|
|
||||||
<ClCompile Include="main.c">
|
|
||||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Run-time-stats-utils.c" />
|
|
||||||
<ClCompile Include="UDPCommandServer.c" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="FreeRTOSConfig.h" />
|
|
||||||
<ClInclude Include="Trace_Recorder_Configuration\trcConfig.h" />
|
|
||||||
<ClInclude Include="Trace_Recorder_Configuration\trcSnapshotConfig.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>
|
|
||||||
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Demo App Source">
|
|
||||||
<UniqueIdentifier>{34567deb-d5ab-4a56-8640-0aaec609521a}</UniqueIdentifier>
|
|
||||||
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS">
|
|
||||||
<UniqueIdentifier>{af3445a1-4908-4170-89ed-39345d90d30c}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS\Source">
|
|
||||||
<UniqueIdentifier>{f32be356-4763-4cae-9020-974a2638cb08}</UniqueIdentifier>
|
|
||||||
<Extensions>*.c</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS\Source\Portable">
|
|
||||||
<UniqueIdentifier>{88f409e6-d396-4ac5-94bd-7a99c914be46}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS+">
|
|
||||||
<UniqueIdentifier>{e5ad4ec7-23dc-4295-8add-2acaee488f5a}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS+\FreeRTOS+Trace">
|
|
||||||
<UniqueIdentifier>{629e761f-e8a8-430e-b44e-f38d83292b54}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS\Configuration Files">
|
|
||||||
<UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>
|
|
||||||
<Extensions>
|
|
||||||
</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="FreeRTOS+\FreeRTOS+CLI">
|
|
||||||
<UniqueIdentifier>{fd43c0ed-fdbc-437f-a5a3-c50399690bd7}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Demo App Source\Trace Recorder Configuration">
|
|
||||||
<UniqueIdentifier>{91dffc7b-279b-44f6-a2b2-f5d2e132a85d}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="main.c">
|
|
||||||
<Filter>Demo App Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
|
|
||||||
<Filter>FreeRTOS\Source\Portable</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_3.c">
|
|
||||||
<Filter>FreeRTOS\Source\Portable</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\timers.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\list.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\queue.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="UDPCommandServer.c">
|
|
||||||
<Filter>Demo App Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="CLI-commands.c">
|
|
||||||
<Filter>Demo App Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Run-time-stats-utils.c">
|
|
||||||
<Filter>Demo App Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-CLI\FreeRTOS_CLI.c">
|
|
||||||
<Filter>FreeRTOS+\FreeRTOS+CLI</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcKernelPort.c">
|
|
||||||
<Filter>FreeRTOS+\FreeRTOS+Trace</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcSnapshotRecorder.c">
|
|
||||||
<Filter>FreeRTOS+\FreeRTOS+Trace</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\Source\FreeRTOS-Plus-Trace\trcStreamingRecorder.c">
|
|
||||||
<Filter>FreeRTOS+\FreeRTOS+Trace</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\..\FreeRTOS\Source\stream_buffer.c">
|
|
||||||
<Filter>FreeRTOS\Source</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="FreeRTOSConfig.h">
|
|
||||||
<Filter>FreeRTOS\Configuration Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="Trace_Recorder_Configuration\trcConfig.h">
|
|
||||||
<Filter>Demo App Source\Trace Recorder Configuration</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="Trace_Recorder_Configuration\trcSnapshotConfig.h">
|
|
||||||
<Filter>Demo App Source\Trace Recorder Configuration</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 6ddc35ebdcd97a74d39a9c00e9bfa9a6b0febe4e
|
Subproject commit 8b5ec3b3e3a7fbf0c1d47646773ada90fa12b19b
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit 869298bffeea13b205343361b7a7daf2b210e33d
|
Subproject commit edb8fec9882084344a314368ac7fd957a187519c
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue