Skip to content

Commit e37233f

Browse files
LordOfDorksLordOfDorks
committed
Rebranch of the WolfCrypt work.
Signed-off-by: LordOfDorks <[email protected]>
1 parent d81005b commit e37233f

17 files changed

+1341
-59
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -290,3 +290,5 @@ __pycache__/
290290
# TPM simulator run-time/state files
291291
NVChip
292292
RsaKeyCacheCrt.data
293+
TPMCmd/OsslInclude/*
294+
TPMCmd/Lib/*

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "external/wolfssl"]
2+
path = external/wolfssl
3+
url = https://github.com/wolfSSL/wolfssl.git

‎TPMCmd/Platform/platform.vcxproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Coverage|Win32">
55
<Configuration>Coverage</Configuration>
@@ -87,86 +87,86 @@
8787
<RootNamespace>platform</RootNamespace>
8888
<Keyword>Win32Proj</Keyword>
8989
<ProjectName>Platform</ProjectName>
90-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
90+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
9191
</PropertyGroup>
9292
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
9393
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
9494
<ConfigurationType>StaticLibrary</ConfigurationType>
9595
<CharacterSet>Unicode</CharacterSet>
9696
<WholeProgramOptimization>true</WholeProgramOptimization>
97-
<PlatformToolset>v140</PlatformToolset>
97+
<PlatformToolset>v141</PlatformToolset>
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
100100
<ConfigurationType>DynamicLibrary</ConfigurationType>
101101
<CharacterSet>Unicode</CharacterSet>
102102
<WholeProgramOptimization>false</WholeProgramOptimization>
103-
<PlatformToolset>v140</PlatformToolset>
103+
<PlatformToolset>v141</PlatformToolset>
104104
</PropertyGroup>
105105
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
106106
<ConfigurationType>StaticLibrary</ConfigurationType>
107107
<CharacterSet>Unicode</CharacterSet>
108-
<PlatformToolset>v100</PlatformToolset>
108+
<PlatformToolset>v141</PlatformToolset>
109109
</PropertyGroup>
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GCC Debug|Win32'" Label="Configuration">
111111
<ConfigurationType>Makefile</ConfigurationType>
112112
<CharacterSet>Unicode</CharacterSet>
113-
<PlatformToolset>v140</PlatformToolset>
113+
<PlatformToolset>v141</PlatformToolset>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
116116
<ConfigurationType>StaticLibrary</ConfigurationType>
117117
<CharacterSet>Unicode</CharacterSet>
118-
<PlatformToolset>v140</PlatformToolset>
118+
<PlatformToolset>v141</PlatformToolset>
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SelfTest|Win32'" Label="Configuration">
121121
<ConfigurationType>DynamicLibrary</ConfigurationType>
122122
<CharacterSet>Unicode</CharacterSet>
123-
<PlatformToolset>v140</PlatformToolset>
123+
<PlatformToolset>v141</PlatformToolset>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Coverage|Win32'" Label="Configuration">
126126
<ConfigurationType>DynamicLibrary</ConfigurationType>
127127
<CharacterSet>Unicode</CharacterSet>
128-
<PlatformToolset>v140</PlatformToolset>
128+
<PlatformToolset>v141</PlatformToolset>
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
131131
<ConfigurationType>DynamicLibrary</ConfigurationType>
132132
<CharacterSet>Unicode</CharacterSet>
133-
<PlatformToolset>v140</PlatformToolset>
133+
<PlatformToolset>v141</PlatformToolset>
134134
</PropertyGroup>
135135
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
136136
<ConfigurationType>DynamicLibrary</ConfigurationType>
137137
<CharacterSet>Unicode</CharacterSet>
138-
<PlatformToolset>v140</PlatformToolset>
138+
<PlatformToolset>v141</PlatformToolset>
139139
</PropertyGroup>
140140
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GCC Debug|x64'" Label="Configuration">
141141
<ConfigurationType>DynamicLibrary</ConfigurationType>
142142
<CharacterSet>Unicode</CharacterSet>
143-
<PlatformToolset>v140</PlatformToolset>
143+
<PlatformToolset>v141</PlatformToolset>
144144
</PropertyGroup>
145145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
146146
<ConfigurationType>DynamicLibrary</ConfigurationType>
147147
<CharacterSet>Unicode</CharacterSet>
148-
<PlatformToolset>v140</PlatformToolset>
148+
<PlatformToolset>v141</PlatformToolset>
149149
</PropertyGroup>
150150
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SelfTest|x64'" Label="Configuration">
151151
<ConfigurationType>DynamicLibrary</ConfigurationType>
152152
<CharacterSet>Unicode</CharacterSet>
153-
<PlatformToolset>v140</PlatformToolset>
153+
<PlatformToolset>v141</PlatformToolset>
154154
</PropertyGroup>
155155
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Coverage|x64'" Label="Configuration">
156156
<ConfigurationType>DynamicLibrary</ConfigurationType>
157157
<CharacterSet>Unicode</CharacterSet>
158-
<PlatformToolset>v140</PlatformToolset>
158+
<PlatformToolset>v141</PlatformToolset>
159159
</PropertyGroup>
160160
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
161161
<ConfigurationType>DynamicLibrary</ConfigurationType>
162162
<CharacterSet>Unicode</CharacterSet>
163-
<PlatformToolset>v140</PlatformToolset>
163+
<PlatformToolset>v141</PlatformToolset>
164164
</PropertyGroup>
165165
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='GccCompile|x64'">
166-
<PlatformToolset>v140</PlatformToolset>
166+
<PlatformToolset>v141</PlatformToolset>
167167
</PropertyGroup>
168168
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='GccCompile|Win32'">
169-
<PlatformToolset>v140</PlatformToolset>
169+
<PlatformToolset>v141</PlatformToolset>
170170
<ConfigurationType>Makefile</ConfigurationType>
171171
</PropertyGroup>
172172
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎TPMCmd/Simulator/simulator.vcxproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Coverage|Win32">
55
<Configuration>Coverage</Configuration>
@@ -71,86 +71,86 @@
7171
<RootNamespace>simulator</RootNamespace>
7272
<Keyword>Win32Proj</Keyword>
7373
<ProjectName>Simulator</ProjectName>
74-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
74+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
7575
</PropertyGroup>
7676
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7878
<ConfigurationType>Application</ConfigurationType>
7979
<CharacterSet>Unicode</CharacterSet>
8080
<WholeProgramOptimization>false</WholeProgramOptimization>
81-
<PlatformToolset>v140</PlatformToolset>
81+
<PlatformToolset>v141</PlatformToolset>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8484
<ConfigurationType>Application</ConfigurationType>
8585
<CharacterSet>Unicode</CharacterSet>
8686
<WholeProgramOptimization>false</WholeProgramOptimization>
87-
<PlatformToolset>v140</PlatformToolset>
87+
<PlatformToolset>v141</PlatformToolset>
8888
</PropertyGroup>
8989
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
9090
<ConfigurationType>Application</ConfigurationType>
9191
<CharacterSet>Unicode</CharacterSet>
92-
<PlatformToolset>v100</PlatformToolset>
92+
<PlatformToolset>v141</PlatformToolset>
9393
</PropertyGroup>
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GCC Debug|Win32'" Label="Configuration">
9595
<ConfigurationType>Makefile</ConfigurationType>
9696
<CharacterSet>Unicode</CharacterSet>
97-
<PlatformToolset>v140</PlatformToolset>
97+
<PlatformToolset>v141</PlatformToolset>
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration">
100100
<ConfigurationType>Application</ConfigurationType>
101101
<CharacterSet>Unicode</CharacterSet>
102-
<PlatformToolset>v140</PlatformToolset>
102+
<PlatformToolset>v141</PlatformToolset>
103103
</PropertyGroup>
104104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SelfTest|Win32'" Label="Configuration">
105105
<ConfigurationType>Application</ConfigurationType>
106106
<CharacterSet>Unicode</CharacterSet>
107-
<PlatformToolset>v140</PlatformToolset>
107+
<PlatformToolset>v141</PlatformToolset>
108108
</PropertyGroup>
109109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Coverage|Win32'" Label="Configuration">
110110
<ConfigurationType>Application</ConfigurationType>
111111
<CharacterSet>Unicode</CharacterSet>
112-
<PlatformToolset>v140</PlatformToolset>
112+
<PlatformToolset>v141</PlatformToolset>
113113
</PropertyGroup>
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
115115
<ConfigurationType>Application</ConfigurationType>
116116
<CharacterSet>Unicode</CharacterSet>
117-
<PlatformToolset>v140</PlatformToolset>
117+
<PlatformToolset>v141</PlatformToolset>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
120120
<ConfigurationType>Application</ConfigurationType>
121121
<CharacterSet>Unicode</CharacterSet>
122-
<PlatformToolset>v140</PlatformToolset>
122+
<PlatformToolset>v141</PlatformToolset>
123123
</PropertyGroup>
124124
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GCC Debug|x64'" Label="Configuration">
125125
<ConfigurationType>Application</ConfigurationType>
126126
<CharacterSet>Unicode</CharacterSet>
127-
<PlatformToolset>v140</PlatformToolset>
127+
<PlatformToolset>v141</PlatformToolset>
128128
</PropertyGroup>
129129
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration">
130130
<ConfigurationType>Application</ConfigurationType>
131131
<CharacterSet>Unicode</CharacterSet>
132-
<PlatformToolset>v140</PlatformToolset>
132+
<PlatformToolset>v141</PlatformToolset>
133133
</PropertyGroup>
134134
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SelfTest|x64'" Label="Configuration">
135135
<ConfigurationType>Application</ConfigurationType>
136136
<CharacterSet>Unicode</CharacterSet>
137-
<PlatformToolset>v140</PlatformToolset>
137+
<PlatformToolset>v141</PlatformToolset>
138138
</PropertyGroup>
139139
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Coverage|x64'" Label="Configuration">
140140
<ConfigurationType>Application</ConfigurationType>
141141
<CharacterSet>Unicode</CharacterSet>
142-
<PlatformToolset>v140</PlatformToolset>
142+
<PlatformToolset>v141</PlatformToolset>
143143
</PropertyGroup>
144144
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
145145
<ConfigurationType>Application</ConfigurationType>
146146
<CharacterSet>Unicode</CharacterSet>
147-
<PlatformToolset>v140</PlatformToolset>
147+
<PlatformToolset>v141</PlatformToolset>
148148
</PropertyGroup>
149149
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='GccCompile|x64'">
150-
<PlatformToolset>v140</PlatformToolset>
150+
<PlatformToolset>v141</PlatformToolset>
151151
</PropertyGroup>
152152
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='GccCompile|Win32'">
153-
<PlatformToolset>v140</PlatformToolset>
153+
<PlatformToolset>v141</PlatformToolset>
154154
<ConfigurationType>Makefile</ConfigurationType>
155155
</PropertyGroup>
156156
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)