From da00ff6db5e68773996ec79d711c45fb3444c580 Mon Sep 17 00:00:00 2001
From: NingSun <ning.sun@intel.com>
Date: Wed, 14 Mar 2018 16:35:31 -0700
Subject: Remove win32 support in SoftHSMv2

Due to license issue, we have to remove win32 support in SoftHSMv2.

Issue-ID: AAF-151
Change-Id: I31dda45ed84065819e26be8205747dd096a37432
Signed-off-by: NingSun <ning.sun@intel.com>
---
 SoftHSMv2/win32/p11test/p11test.vcxproj.filters | 181 ------------------------
 SoftHSMv2/win32/p11test/p11test.vcxproj.in      | 159 ---------------------
 SoftHSMv2/win32/p11test/p11test.vcxproj.user    |   3 -
 3 files changed, 343 deletions(-)
 delete mode 100644 SoftHSMv2/win32/p11test/p11test.vcxproj.filters
 delete mode 100644 SoftHSMv2/win32/p11test/p11test.vcxproj.in
 delete mode 100644 SoftHSMv2/win32/p11test/p11test.vcxproj.user

(limited to 'SoftHSMv2/win32/p11test')

diff --git a/SoftHSMv2/win32/p11test/p11test.vcxproj.filters b/SoftHSMv2/win32/p11test/p11test.vcxproj.filters
deleted file mode 100644
index fa7e86f..0000000
--- a/SoftHSMv2/win32/p11test/p11test.vcxproj.filters
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Lib Header Files">
-      <UniqueIdentifier>{8440d7eb-5530-4f5e-a355-a43435742c60}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Lib Source Files">
-      <UniqueIdentifier>{3c33d54e-4bd1-43e0-bcc7-0d6adcfd5dc7}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Other Header Files">
-      <UniqueIdentifier>{ff435d2e-c67a-4f47-9731-28d88617e559}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Other Source Files">
-      <UniqueIdentifier>{5df8b0a3-ecc7-4876-aea2-8421c0846535}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\lib\test\AsymEncryptDecryptTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\AsymWrapUnwrapTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\DeriveTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\DigestTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\InfoTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\InitTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\ObjectTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\RandomTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\SessionTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\SignVerifyTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\SymmetricAlgorithmTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\TestsBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\TestsNoPINInitBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\TokenTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\test\UserTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\osmutex.h">
-      <Filter>Other Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\win32\setenv.h">
-      <Filter>Other Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\access.h">
-      <Filter>Lib Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\pkcs11\cryptoki.h">
-      <Filter>Lib Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11.h">
-      <Filter>Other Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11f.h">
-      <Filter>Other Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11t.h">
-      <Filter>Other Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\P11Attributes.h">
-      <Filter>Lib Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\P11Objects.h">
-      <Filter>Lib Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\SoftHSM.h">
-      <Filter>Lib Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\lib\test\AsymEncryptDecryptTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\AsymWrapUnwrapTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\DeriveTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\DigestTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\InfoTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\InitTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\ObjectTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\RandomTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\SessionTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\SignVerifyTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\SymmetricAlgorithmTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\TestsBase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\TestsNoPINInitBase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\TokenTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\UserTests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\osmutex.cpp">
-      <Filter>Other Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\win32\setenv.cpp">
-      <Filter>Other Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\access.cpp">
-      <Filter>Lib Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\main.cpp">
-      <Filter>Lib Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\P11Attributes.cpp">
-      <Filter>Lib Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\P11Objects.cpp">
-      <Filter>Lib Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\SoftHSM.cpp">
-      <Filter>Lib Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\test\p11test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/SoftHSMv2/win32/p11test/p11test.vcxproj.in b/SoftHSMv2/win32/p11test/p11test.vcxproj.in
deleted file mode 100644
index c8a493c..0000000
--- a/SoftHSMv2/win32/p11test/p11test.vcxproj.in
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7C5EE7FC-B5FC-47BF-8164-A452FE689472}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>p11test</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-	<PlatformToolset>@PLATFORMTOOLSET@</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-	<PlatformToolset>@PLATFORMTOOLSET@</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <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|@PLATFORM@'">
-    <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|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\lib;..\..\src\lib\test;..\..\src\lib\pkcs11;..\..\src\lib\common;..\..\src\lib\crypto;..\..\src\lib\object_store;..\..\src\lib\data_mgr;..\..\src\lib\session_mgr;..\..\src\lib\slot_mgr;..\..\src\lib\handle_mgr;..\..\src\lib\win32;@CUINCPATH@;@INCLUDEPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>@RUNTIMELIBRARY@</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\@PLATFORMDIR@$(Configuration);@CULIBPATH@;@DEBUGLIBPATH@;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>convarch.lib;cppunitd.lib;@LIBNAME@;@EXTRALIBS@%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-copy ..\..\src\lib\test\softhsm2.conf.win32 "$(TargetDir)\softhsm2.conf"
-copy ..\..\src\lib\test\softhsm2-alt.conf.win32 "$(TargetDir)\softhsm2-alt.conf"
-mkdir "$(TargetDir)\tokens" 2&gt; nul
-copy ..\..\src\lib\test\tokens\dummy.in "$(TargetDir)\tokens\dummy"
-      </Command>
-      <Message>Copying dummy test files to Debug folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\lib;..\..\src\lib\test;..\..\src\lib\pkcs11;..\..\src\lib\common;..\..\src\lib\crypto;..\..\src\lib\object_store;..\..\src\lib\data_mgr;..\..\src\lib\session_mgr;..\..\src\lib\slot_mgr;..\..\src\lib\handle_mgr;..\..\src\lib\win32;@CUINCPATH@;@INCLUDEPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>@RUNTIMELIBRARY@</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\@PLATFORMDIR@$(Configuration);@CULIBPATH@;@LIBPATH@;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>convarch.lib;cppunit.lib;@LIBNAME@;@EXTRALIBS@%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-copy ..\..\src\lib\test\softhsm2.conf.win32 "$(TargetDir)\softhsm2.conf"
-copy ..\..\src\lib\test\softhsm2-alt.conf.win32 "$(TargetDir)\softhsm2-alt.conf"
-mkdir "$(TargetDir)\tokens" 2&gt; nul
-copy ..\..\src\lib\test\tokens\dummy.in "$(TargetDir)\tokens\dummy"
-      </Command>
-      <Message>Copying dummy test files to Release folder</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\lib\access.h" />
-    <ClInclude Include="..\..\src\lib\common\osmutex.h" />
-    <ClInclude Include="..\..\src\lib\pkcs11\cryptoki.h" />
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11.h" />
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11f.h" />
-    <ClInclude Include="..\..\src\lib\pkcs11\pkcs11t.h" />
-    <ClInclude Include="..\..\src\lib\P11Attributes.h" />
-    <ClInclude Include="..\..\src\lib\P11Objects.h" />
-    <ClInclude Include="..\..\src\lib\SoftHSM.h" />
-    <ClInclude Include="..\..\src\lib\test\AsymEncryptDecryptTests.h" />
-    <ClInclude Include="..\..\src\lib\test\AsymWrapUnwrapTests.h" />
-    <ClInclude Include="..\..\src\lib\test\DeriveTests.h" />
-    <ClInclude Include="..\..\src\lib\test\DigestTests.h" />
-    <ClInclude Include="..\..\src\lib\test\InfoTests.h" />
-    <ClInclude Include="..\..\src\lib\test\InitTests.h" />
-    <ClInclude Include="..\..\src\lib\test\ObjectTests.h" />
-    <ClInclude Include="..\..\src\lib\test\RandomTests.h" />
-    <ClInclude Include="..\..\src\lib\test\SessionTests.h" />
-    <ClInclude Include="..\..\src\lib\test\SignVerifyTests.h" />
-    <ClInclude Include="..\..\src\lib\test\SymmetricAlgorithmTests.h" />
-    <ClInclude Include="..\..\src\lib\test\TestsBase.h" />
-    <ClInclude Include="..\..\src\lib\test\TestsNoPINInitBase.h" />
-    <ClInclude Include="..\..\src\lib\test\TokenTests.h" />
-    <ClInclude Include="..\..\src\lib\test\UserTests.h" />
-    <ClInclude Include="..\..\src\lib\win32\setenv.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\lib\access.cpp" />
-    <ClCompile Include="..\..\src\lib\common\osmutex.cpp" />
-    <ClCompile Include="..\..\src\lib\main.cpp" />
-    <ClCompile Include="..\..\src\lib\P11Attributes.cpp" />
-    <ClCompile Include="..\..\src\lib\P11Objects.cpp" />
-    <ClCompile Include="..\..\src\lib\SoftHSM.cpp" />
-    <ClCompile Include="..\..\src\lib\test\AsymEncryptDecryptTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\AsymWrapUnwrapTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\DeriveTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\DigestTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\InfoTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\InitTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\ObjectTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\p11test.cpp" />
-    <ClCompile Include="..\..\src\lib\test\RandomTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\SessionTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\SignVerifyTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\SymmetricAlgorithmTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\TestsBase.cpp" />
-    <ClCompile Include="..\..\src\lib\test\TestsNoPINInitBase.cpp" />
-    <ClCompile Include="..\..\src\lib\test\TokenTests.cpp" />
-    <ClCompile Include="..\..\src\lib\test\UserTests.cpp" />
-    <ClCompile Include="..\..\src\lib\win32\setenv.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/SoftHSMv2/win32/p11test/p11test.vcxproj.user b/SoftHSMv2/win32/p11test/p11test.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/SoftHSMv2/win32/p11test/p11test.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
-- 
cgit 1.2.3-korg