3 files changed, 0 insertions, 1305 deletions
diff --git a/SoftHSMv2/win32/convarch/convarch.vcxproj.filters.in b/SoftHSMv2/win32/convarch/convarch.vcxproj.filters.in
deleted file mode 100644
index d3c84f1..0000000
--- a/SoftHSMv2/win32/convarch/convarch.vcxproj.filters.in
+++ /dev/null
@@ -1,928 +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>{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="Common Header Files">
-      <UniqueIdentifier>{b657b1af-4cc4-4d97-ba6a-0a7231c5f243}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Common Source Files">
-      <UniqueIdentifier>{aacfc93a-d2e0-4935-aa15-ea0d3690fbcd}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Crypto Header Files">
-      <UniqueIdentifier>{6337c51f-53e3-440a-9ab9-40f0b9a4f26e}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Crypto Source Files">
-      <UniqueIdentifier>{8566a5d1-d688-41da-bbc3-3d860f2db764}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Data Mgr Header Files">
-      <UniqueIdentifier>{b427db7b-49c3-47b0-982a-7da01cf39c8e}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Data Mgr Source Files">
-      <UniqueIdentifier>{04a46825-a433-4b5c-9c3f-8c489978cb8a}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Handle Mgr Header Files">
-      <UniqueIdentifier>{9e67afe5-3252-4c46-a24f-096e4a35e174}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Handle Mgr Source Files">
-      <UniqueIdentifier>{b8a7e894-ebbe-43de-ad66-3c45d91aac8e}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Object Store Header Files">
-      <UniqueIdentifier>{0c47956d-aa5e-4c26-bee4-63ec89c0ab64}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Object Store Source Files">
-      <UniqueIdentifier>{45c69303-5073-4bde-8b63-2f2e2a688362}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Session Mgr Header Files">
-      <UniqueIdentifier>{d1a8b25d-8ebb-4a79-ae8c-70ef3c0bed5f}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Session Mgr Source Files">
-      <UniqueIdentifier>{cb379241-3d4b-4f7c-b7d1-c6c83d3a1b62}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Slot Mgr Header Files">
-      <UniqueIdentifier>{5420eba7-6b85-4daf-a916-c85421362984}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Slot Mgr Source Files">
-      <UniqueIdentifier>{3c9f55a5-d1a8-4716-a416-ec172a676e63}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Win32 Source Files">
-      <UniqueIdentifier>{63e3d8a2-0853-4f98-bcaa-de05da380d37}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Win32 Header Files">
-      <UniqueIdentifier>{59b2221a-36a3-4f2c-9883-6173599baf5a}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\lib\common\Configuration.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\fatal.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\HandleFactory.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\log.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\MutexFactory.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\osmutex.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\Serialisable.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\common\SimpleConfigLoader.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\AESKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricParameters.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-@IF BOTAN
-    <ClInclude Include="..\..\src\lib\crypto\BotanAES.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanCryptoFactory.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDES.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDH.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSA.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDH.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSA.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOST.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTR3411.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanHashAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanMAC.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanMacAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanMD5.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanRNG.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSA.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAKeyPair.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA1.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA224.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA256.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA384.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA512.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanSymmetricAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\BotanUtil.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\Botan_ecb.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\Botan_rounding.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-@END BOTAN
-    <ClInclude Include="..\..\src\lib\crypto\CryptoFactory.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DESKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DHParameters.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DHPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DHPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DSAParameters.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DSAPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\DSAPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\ECParameters.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\ECPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\ECPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\GOSTPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\GOSTPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\HashAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\MacAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\odd.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-@IF OPENSSL
-     <ClInclude Include="..\..\src\lib\crypto\OSSLAES.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLCryptoFactory.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDES.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDH.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHKeyPair.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHPrivateKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAPrivateKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHPublicKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSA.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAKeyPair.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAPublicKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECDH.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECDSA.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECKeyPair.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECPrivateKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECPublicKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPHashAlgorithm.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPCMacAlgorithm.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPMacAlgorithm.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPSymmetricAlgorithm.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOST.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTKeyPair.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTPrivateKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTPublicKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTR3411.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLCMAC.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLHMAC.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLMD5.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRNG.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSA.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAKeyPair.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAPrivateKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAPublicKey.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA1.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA224.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA256.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA384.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA512.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-     <ClInclude Include="..\..\src\lib\crypto\OSSLUtil.h">
-       <Filter>Crypto Header Files</Filter>
-     </ClInclude>
-@END OPENSSL
-    <ClInclude Include="..\..\src\lib\crypto\PrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\PublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\RNG.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\RSAParameters.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\RSAPrivateKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\RSAPublicKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\SymmetricAlgorithm.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\crypto\SymmetricKey.h">
-      <Filter>Crypto Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\ByteString.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\RFC4880.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\salloc.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureAllocator.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureMemoryRegistry.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureDataManager.h">
-      <Filter>Data Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\handle_mgr\Handle.h">
-      <Filter>Handle Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\handle_mgr\HandleManager.h">
-      <Filter>Handle Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\Directory.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\File.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\FindOperation.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\Generation.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\ObjectFile.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\ObjectStore.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\ObjectStoreToken.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\OSAttribute.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\OSAttributes.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\OSObject.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\OSPathSep.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\OSToken.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\SessionObject.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\SessionObjectStore.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\object_store\UUID.h">
-      <Filter>Object Store Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\session_mgr\Session.h">
-      <Filter>Session Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\session_mgr\SessionManager.h">
-      <Filter>Session Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\slot_mgr\Slot.h">
-      <Filter>Slot Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\slot_mgr\SlotManager.h">
-      <Filter>Slot Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\slot_mgr\Token.h">
-      <Filter>Slot Mgr Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lib\win32\syslog.h">
-      <Filter>Win32 Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\lib\common\Configuration.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\fatal.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\log.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\MutexFactory.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\osmutex.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\common\SimpleConfigLoader.cpp">
-      <Filter>Common Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\AsymmetricAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\AsymmetricKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-@IF BOTAN
-    <ClCompile Include="..\..\src\lib\crypto\BotanAES.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanCryptoFactory.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDES.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDH.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSA.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDH.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSA.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOST.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTR3411.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanHashAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanMAC.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanMacAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanMD5.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanRNG.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSA.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAKeyPair.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA1.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA224.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA256.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA384.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA512.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanSymmetricAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\BotanUtil.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\Botan_ecb.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-@END BOTAN
-    <ClCompile Include="..\..\src\lib\crypto\CryptoFactory.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DESKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DHParameters.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DHPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DHPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DSAParameters.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DSAPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\DSAPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\ECParameters.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\ECPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\ECPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\GOSTPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\GOSTPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\HashAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\MacAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-@IF OPENSSL
-     <ClCompile Include="..\..\src\lib\crypto\OSSLAES.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLCryptoFactory.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDES.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDH.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHKeyPair.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHPrivateKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHPublicKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSA.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAKeyPair.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAPrivateKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAPublicKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECDH.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECDSA.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECKeyPair.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECPrivateKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECPublicKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPHashAlgorithm.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPCMacAlgorithm.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPMacAlgorithm.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPSymmetricAlgorithm.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOST.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTKeyPair.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTPrivateKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTPublicKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTR3411.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLCMAC.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLHMAC.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLMD5.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRNG.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSA.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAKeyPair.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAPrivateKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAPublicKey.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA1.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA224.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA256.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA384.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA512.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-     <ClCompile Include="..\..\src\lib\crypto\OSSLUtil.cpp">
-       <Filter>Crypto Source Files</Filter>
-     </ClCompile>
-@END OPENSSL
-    <ClCompile Include="..\..\src\lib\crypto\RSAParameters.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\RSAPrivateKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\RSAPublicKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\SymmetricAlgorithm.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\crypto\SymmetricKey.cpp">
-      <Filter>Crypto Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\data_mgr\ByteString.cpp">
-      <Filter>Data Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\data_mgr\RFC4880.cpp">
-      <Filter>Data Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\data_mgr\salloc.cpp">
-      <Filter>Data Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\data_mgr\SecureDataManager.cpp">
-      <Filter>Data Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\data_mgr\SecureMemoryRegistry.cpp">
-      <Filter>Data Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\handle_mgr\Handle.cpp">
-      <Filter>Handle Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\handle_mgr\HandleManager.cpp">
-      <Filter>Handle Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\Directory.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\File.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\FindOperation.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\Generation.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\ObjectFile.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\ObjectStore.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\ObjectStoreToken.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\OSAttribute.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\OSToken.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\SessionObject.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\SessionObjectStore.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\object_store\UUID.cpp">
-      <Filter>Object Store Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\session_mgr\Session.cpp">
-      <Filter>Session Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\session_mgr\SessionManager.cpp">
-      <Filter>Session Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\slot_mgr\Slot.cpp">
-      <Filter>Slot Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\slot_mgr\SlotManager.cpp">
-      <Filter>Slot Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\slot_mgr\Token.cpp">
-      <Filter>Slot Mgr Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lib\win32\syslog.cpp">
-      <Filter>Win32 Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/SoftHSMv2/win32/convarch/convarch.vcxproj.in b/SoftHSMv2/win32/convarch/convarch.vcxproj.in
deleted file mode 100644
index b711f35..0000000
--- a/SoftHSMv2/win32/convarch/convarch.vcxproj.in
+++ /dev/null
@@ -1,374 +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>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\lib\common\Configuration.h" />
-    <ClInclude Include="..\..\src\lib\common\fatal.h" />
-    <ClInclude Include="..\..\src\lib\common\HandleFactory.h" />
-    <ClInclude Include="..\..\src\lib\common\log.h" />
-    <ClInclude Include="..\..\src\lib\common\MutexFactory.h" />
-    <ClInclude Include="..\..\src\lib\common\osmutex.h" />
-    <ClInclude Include="..\..\src\lib\common\Serialisable.h" />
-    <ClInclude Include="..\..\src\lib\common\SimpleConfigLoader.h" />
-    <ClInclude Include="..\..\src\lib\crypto\AESKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\AsymmetricParameters.h" />
-@IF BOTAN
-    <ClInclude Include="..\..\src\lib\crypto\BotanAES.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanCryptoFactory.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDES.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDH.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDHPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSA.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanDSAPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDH.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDHPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSA.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanECDSAPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOST.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanGOSTR3411.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanHashAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanMAC.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanMacAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanMD5.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanRNG.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSA.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAKeyPair.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanRSAPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA1.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA224.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA256.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA384.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSHA512.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanSymmetricAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\BotanUtil.h" />
-    <ClInclude Include="..\..\src\lib\crypto\Botan_ecb.h" />
-    <ClInclude Include="..\..\src\lib\crypto\Botan_rounding.h" />
-@END BOTAN
-    <ClInclude Include="..\..\src\lib\crypto\CryptoFactory.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DESKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DHParameters.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DHPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DHPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DSAParameters.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DSAPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\DSAPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\ECParameters.h" />
-    <ClInclude Include="..\..\src\lib\crypto\ECPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\ECPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\GOSTPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\GOSTPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\HashAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\MacAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\odd.h" />
-@IF OPENSSL
-     <ClInclude Include="..\..\src\lib\crypto\OSSLAES.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLCryptoFactory.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDES.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDH.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHKeyPair.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHPrivateKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDHPublicKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSA.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAKeyPair.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAPrivateKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLDSAPublicKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECDH.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECDSA.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECKeyPair.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECPrivateKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLECPublicKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPHashAlgorithm.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPCMacAlgorithm.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPMacAlgorithm.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLEVPSymmetricAlgorithm.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOST.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTKeyPair.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTPrivateKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTPublicKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLGOSTR3411.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLCMAC.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLHMAC.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLMD5.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRNG.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSA.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAKeyPair.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAPrivateKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLRSAPublicKey.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA1.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA224.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA256.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA384.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLSHA512.h" />
-     <ClInclude Include="..\..\src\lib\crypto\OSSLUtil.h" />
-@END OPENSSL
-    <ClInclude Include="..\..\src\lib\crypto\PrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\PublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\RNG.h" />
-    <ClInclude Include="..\..\src\lib\crypto\RSAParameters.h" />
-    <ClInclude Include="..\..\src\lib\crypto\RSAPrivateKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\RSAPublicKey.h" />
-    <ClInclude Include="..\..\src\lib\crypto\SymmetricAlgorithm.h" />
-    <ClInclude Include="..\..\src\lib\crypto\SymmetricKey.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\ByteString.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\RFC4880.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\salloc.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureAllocator.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureDataManager.h" />
-    <ClInclude Include="..\..\src\lib\data_mgr\SecureMemoryRegistry.h" />
-    <ClInclude Include="..\..\src\lib\handle_mgr\Handle.h" />
-    <ClInclude Include="..\..\src\lib\handle_mgr\HandleManager.h" />
-    <ClInclude Include="..\..\src\lib\object_store\Directory.h" />
-    <ClInclude Include="..\..\src\lib\object_store\File.h" />
-    <ClInclude Include="..\..\src\lib\object_store\FindOperation.h" />
-    <ClInclude Include="..\..\src\lib\object_store\Generation.h" />
-    <ClInclude Include="..\..\src\lib\object_store\ObjectFile.h" />
-    <ClInclude Include="..\..\src\lib\object_store\ObjectStore.h" />
-    <ClInclude Include="..\..\src\lib\object_store\ObjectStoreToken.h" />
-    <ClInclude Include="..\..\src\lib\object_store\OSAttribute.h" />
-    <ClInclude Include="..\..\src\lib\object_store\OSAttributes.h" />
-    <ClInclude Include="..\..\src\lib\object_store\OSObject.h" />
-    <ClInclude Include="..\..\src\lib\object_store\OSPathSep.h" />
-    <ClInclude Include="..\..\src\lib\object_store\OSToken.h" />
-    <ClInclude Include="..\..\src\lib\object_store\SessionObject.h" />
-    <ClInclude Include="..\..\src\lib\object_store\SessionObjectStore.h" />
-    <ClInclude Include="..\..\src\lib\object_store\UUID.h" />
-    <ClInclude Include="..\..\src\lib\session_mgr\Session.h" />
-    <ClInclude Include="..\..\src\lib\session_mgr\SessionManager.h" />
-    <ClInclude Include="..\..\src\lib\slot_mgr\Slot.h" />
-    <ClInclude Include="..\..\src\lib\slot_mgr\SlotManager.h" />
-    <ClInclude Include="..\..\src\lib\slot_mgr\Token.h" />
-    <ClInclude Include="..\..\src\lib\win32\syslog.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\lib\common\Configuration.cpp" />
-    <ClCompile Include="..\..\src\lib\common\fatal.cpp" />
-    <ClCompile Include="..\..\src\lib\common\log.cpp" />
-    <ClCompile Include="..\..\src\lib\common\MutexFactory.cpp" />
-    <ClCompile Include="..\..\src\lib\common\osmutex.cpp" />
-    <ClCompile Include="..\..\src\lib\common\SimpleConfigLoader.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\AESKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\AsymmetricAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\AsymmetricKeyPair.cpp" />
-@IF BOTAN
-    <ClCompile Include="..\..\src\lib\crypto\BotanAES.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanCryptoFactory.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDES.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDH.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDHPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSA.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanDSAPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDH.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDHPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSA.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanECDSAPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOST.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanGOSTR3411.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanHashAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanMAC.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanMacAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanMD5.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanRNG.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSA.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAKeyPair.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanRSAPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA1.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA224.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA256.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA384.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSHA512.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanSymmetricAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\BotanUtil.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\Botan_ecb.cpp" />
-@END BOTAN
-    <ClCompile Include="..\..\src\lib\crypto\CryptoFactory.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DESKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DHParameters.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DHPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DHPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DSAParameters.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DSAPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\DSAPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\ECParameters.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\ECPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\ECPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\GOSTPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\GOSTPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\HashAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\MacAlgorithm.cpp" />
-@IF OPENSSL
-     <ClCompile Include="..\..\src\lib\crypto\OSSLAES.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLCryptoFactory.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDES.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDH.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHKeyPair.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHPrivateKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDHPublicKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSA.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAKeyPair.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAPrivateKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLDSAPublicKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECDH.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECDSA.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECKeyPair.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECPrivateKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLECPublicKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPHashAlgorithm.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPCMacAlgorithm.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPMacAlgorithm.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLEVPSymmetricAlgorithm.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOST.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTKeyPair.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTPrivateKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTPublicKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLGOSTR3411.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLCMAC.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLHMAC.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLMD5.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRNG.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSA.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAKeyPair.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAPrivateKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLRSAPublicKey.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA1.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA224.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA256.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA384.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLSHA512.cpp" />
-     <ClCompile Include="..\..\src\lib\crypto\OSSLUtil.cpp" />
-@END OPENSSL
-    <ClCompile Include="..\..\src\lib\crypto\RSAParameters.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\RSAPrivateKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\RSAPublicKey.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\SymmetricAlgorithm.cpp" />
-    <ClCompile Include="..\..\src\lib\crypto\SymmetricKey.cpp" />
-    <ClCompile Include="..\..\src\lib\data_mgr\ByteString.cpp" />
-    <ClCompile Include="..\..\src\lib\data_mgr\RFC4880.cpp" />
-    <ClCompile Include="..\..\src\lib\data_mgr\salloc.cpp" />
-    <ClCompile Include="..\..\src\lib\data_mgr\SecureDataManager.cpp" />
-    <ClCompile Include="..\..\src\lib\data_mgr\SecureMemoryRegistry.cpp" />
-    <ClCompile Include="..\..\src\lib\handle_mgr\Handle.cpp" />
-    <ClCompile Include="..\..\src\lib\handle_mgr\HandleManager.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\Directory.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\File.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\FindOperation.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\Generation.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\ObjectFile.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\ObjectStore.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\ObjectStoreToken.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\OSAttribute.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\OSToken.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\SessionObject.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\SessionObjectStore.cpp" />
-    <ClCompile Include="..\..\src\lib\object_store\UUID.cpp" />
-    <ClCompile Include="..\..\src\lib\session_mgr\Session.cpp" />
-    <ClCompile Include="..\..\src\lib\session_mgr\SessionManager.cpp" />
-    <ClCompile Include="..\..\src\lib\slot_mgr\Slot.cpp" />
-    <ClCompile Include="..\..\src\lib\slot_mgr\SlotManager.cpp" />
-    <ClCompile Include="..\..\src\lib\slot_mgr\Token.cpp" />
-    <ClCompile Include="..\..\src\lib\win32\syslog.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F64541B6-FFBF-4368-B93A-A5CA8ADAD795}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>convarch</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-	<PlatformToolset>@PLATFORMTOOLSET@</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</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 />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\lib;..\..\src\lib\pkcs11;..\..\src\lib\common;..\..\src\lib\object_store;..\..\src\lib\slot_mgr;..\..\src\lib\session_mgr;..\..\src\lib\handle_mgr;..\..\src\lib\crypto;..\..\src\lib\win32;..\..\src\lib\data_mgr;@DEBUGINCPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>@RUNTIMELIBRARY@</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </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;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\lib;..\..\src\lib\pkcs11;..\..\src\lib\common;..\..\src\lib\object_store;..\..\src\lib\slot_mgr;..\..\src\lib\session_mgr;..\..\src\lib\handle_mgr;..\..\src\lib\crypto;..\..\src\lib\win32;..\..\src\lib\data_mgr;@INCLUDEPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>@RUNTIMELIBRARY@</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/SoftHSMv2/win32/convarch/convarch.vcxproj.user b/SoftHSMv2/win32/convarch/convarch.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/SoftHSMv2/win32/convarch/convarch.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