build: Add Visual Studio solution for ESAPI

Create tss2-esys solution

Add the following functions to tss2-sys.def because tss2-esys uses
them:
 - SetCmdAuths
 - ExecuteAsync
 - ExecuteFinish
 - CreateLoaded_Prepare
 - CreateLoaded_Complete
 - PolicyAuthorizeNV_Prepare
 - PolicyAuthorizeNV_Complete
 - PolicyTemplate_Prepare
 - PolicyTemplate_Complete
 - GetTctiContext
 - GetCommandCode
 - GetCpBuffer
 - GetDecryptParam
 - GetRspAuths
 - GetRpBuffer

Create tss2-esys.def

Add the following source files to the tss2-sys solution
 - CreateLoaded.c
 - PolicyAuthorizeNV.c
 - PolicyTemplate.c

Add mu_tpm2b_template functions to tss2-mu.def

Change esys_tcti_default to only load the device tcti when not on
Windows

Install 32 and 64 bit gcrypt libraries during appveyor build for use in
the tss2-esys builds.
 - The 32 bit GnuPG installer errors out when running due to the PATH
 env variable on the appveyor VM being too large, to get around this I
 am simply extracting the files from the installer into the install
 directory.
 - I have not found any 64 bit GnuPG binaries, so these are being built
 from source. This increases the Appveyor build time to ten minutes.

Signed-off-by: David Maria <davidjmaria@fb.com>

10 files changed, 1108 insertions, 0 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 5ea3f7c6..23047da6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,14 @@ pull_requests:
   do_not_increment_build_number: true
 skip_tags: true
 image: Visual Studio 2017
+before_build:
+  - ps: wget "ftp://ftp.gnupg.org/gcrypt/binary/gnupg-w32-2.2.8_20180613.exe" -outfile gnupg-w32-2.2.8_20180613.exe
+  - ps: 7z.exe x gnupg-w32-2.2.8_20180613.exe -o"C:\Program Files (x86)\GnuPG"
+  - C:\msys64\usr\bin\bash.exe -lc "wget -q https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.31.tar.bz2 && tar xvf libgpg-error-1.31.tar.bz2"
+  - C:\msys64\usr\bin\bash.exe -lc "export PATH=$PATH\:/mingw64/bin:/usr/bin && cd libgpg-error-1.31 && ./configure --host=x86_64-w64-mingw32 --prefix=/tmp/GnuPG && make install"
+  - C:\msys64\usr\bin\bash.exe -lc "wget -q https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.3.tar.bz2 && tar xvf libgcrypt-1.8.3.tar.bz2"
+  - C:\msys64\usr\bin\bash.exe -lc "export PATH=$PATH\:/mingw64/bin:/usr/bin && cd libgcrypt-1.8.3 && ./configure --host=x86_64-w64-mingw32 --prefix=/tmp/GnuPG --with-gpg-error-prefix=/tmp/GnuPG --disable-asm && make install"
+  - C:\msys64\usr\bin\bash.exe -lc "mv /tmp/GnuPG /c/Program\ Files/"
 configuration:
   - Debug
   - Release
diff --git a/lib/tss2-esys.def b/lib/tss2-esys.def
new file mode 100644
index 00000000..3f1e8c46
--- /dev/null
+++ b/lib/tss2-esys.def
@@ -0,0 +1,354 @@
+LIBRARY tss2-esys
+EXPORTS
+    Esys_ActivateCredential
+    Esys_ActivateCredential_Async
+    Esys_ActivateCredential_Finish
+    Esys_Certify
+    Esys_CertifyCreation
+    Esys_CertifyCreation_Async
+    Esys_CertifyCreation_Finish
+    Esys_Certify_Async
+    Esys_Certify_Finish
+    Esys_ChangeEPS
+    Esys_ChangeEPS_Async
+    Esys_ChangeEPS_Finish
+    Esys_ChangePPS
+    Esys_ChangePPS_Async
+    Esys_ChangePPS_Finish
+    Esys_Clear
+    Esys_ClearControl
+    Esys_ClearControl_Async
+    Esys_ClearControl_Finish
+    Esys_Clear_Async
+    Esys_Clear_Finish
+    Esys_ClockRateAdjust
+    Esys_ClockRateAdjust_Async
+    Esys_ClockRateAdjust_Finish
+    Esys_ClockSet
+    Esys_ClockSet_Async
+    Esys_ClockSet_Finish
+    Esys_Commit
+    Esys_Commit_Async
+    Esys_Commit_Finish
+    Esys_ContextLoad
+    Esys_ContextLoad_Async
+    Esys_ContextLoad_Finish
+    Esys_ContextSave
+    Esys_ContextSave_Async
+    Esys_ContextSave_Finish
+    Esys_Create
+    Esys_CreateLoaded
+    Esys_CreateLoaded_Async
+    Esys_CreateLoaded_Finish
+    Esys_CreatePrimary
+    Esys_CreatePrimary_Async
+    Esys_CreatePrimary_Finish
+    Esys_Create_Async
+    Esys_Create_Finish
+    Esys_DictionaryAttackLockReset
+    Esys_DictionaryAttackLockReset_Async
+    Esys_DictionaryAttackLockReset_Finish
+    Esys_DictionaryAttackParameters
+    Esys_DictionaryAttackParameters_Async
+    Esys_DictionaryAttackParameters_Finish
+    Esys_Duplicate
+    Esys_Duplicate_Async
+    Esys_Duplicate_Finish
+    Esys_ECC_Parameters
+    Esys_ECC_Parameters_Async
+    Esys_ECC_Parameters_Finish
+    Esys_ECDH_KeyGen
+    Esys_ECDH_KeyGen_Async
+    Esys_ECDH_KeyGen_Finish
+    Esys_ECDH_ZGen
+    Esys_ECDH_ZGen_Async
+    Esys_ECDH_ZGen_Finish
+    Esys_EC_Ephemeral
+    Esys_EC_Ephemeral_Async
+    Esys_EC_Ephemeral_Finish
+    Esys_EncryptDecrypt
+    Esys_EncryptDecrypt2
+    Esys_EncryptDecrypt2_Async
+    Esys_EncryptDecrypt2_Finish
+    Esys_EncryptDecrypt_Async
+    Esys_EncryptDecrypt_Finish
+    Esys_EventSequenceComplete
+    Esys_EventSequenceComplete_Async
+    Esys_EventSequenceComplete_Finish
+    Esys_EvictControl
+    Esys_EvictControl_Async
+    Esys_EvictControl_Finish
+    Esys_FieldUpgradeData
+    Esys_FieldUpgradeData_Async
+    Esys_FieldUpgradeData_Finish
+    Esys_FieldUpgradeStart
+    Esys_FieldUpgradeStart_Async
+    Esys_FieldUpgradeStart_Finish
+    Esys_Finalize
+    Esys_FirmwareRead
+    Esys_FirmwareRead_Async
+    Esys_FirmwareRead_Finish
+    Esys_FlushContext
+    Esys_FlushContext_Async
+    Esys_FlushContext_Finish
+    Esys_GetCapability
+    Esys_GetCapability_Async
+    Esys_GetCapability_Finish
+    Esys_GetCommandAuditDigest
+    Esys_GetCommandAuditDigest_Async
+    Esys_GetCommandAuditDigest_Finish
+    Esys_GetPollHandles
+    Esys_GetRandom
+    Esys_GetRandom_Async
+    Esys_GetRandom_Finish
+    Esys_GetSessionAuditDigest
+    Esys_GetSessionAuditDigest_Async
+    Esys_GetSessionAuditDigest_Finish
+    Esys_GetTcti
+    Esys_GetTestResult
+    Esys_GetTestResult_Async
+    Esys_GetTestResult_Finish
+    Esys_GetTime
+    Esys_GetTime_Async
+    Esys_GetTime_Finish
+    Esys_HMAC
+    Esys_HMAC_Async
+    Esys_HMAC_Finish
+    Esys_HMAC_Start
+    Esys_HMAC_Start_Async
+    Esys_HMAC_Start_Finish
+    Esys_Hash
+    Esys_HashSequenceStart
+    Esys_HashSequenceStart_Async
+    Esys_HashSequenceStart_Finish
+    Esys_Hash_Async
+    Esys_Hash_Finish
+    Esys_HierarchyChangeAuth
+    Esys_HierarchyChangeAuth_Async
+    Esys_HierarchyChangeAuth_Finish
+    Esys_HierarchyControl
+    Esys_HierarchyControl_Async
+    Esys_HierarchyControl_Finish
+    Esys_Import
+    Esys_Import_Async
+    Esys_Import_Finish
+    Esys_IncrementalSelfTest
+    Esys_IncrementalSelfTest_Async
+    Esys_IncrementalSelfTest_Finish
+    Esys_Initialize
+    Esys_Load
+    Esys_LoadExternal
+    Esys_LoadExternal_Async
+    Esys_LoadExternal_Finish
+    Esys_Load_Async
+    Esys_Load_Finish
+    Esys_MakeCredential
+    Esys_MakeCredential_Async
+    Esys_MakeCredential_Finish
+    Esys_NV_Certify
+    Esys_NV_Certify_Async
+    Esys_NV_Certify_Finish
+    Esys_NV_ChangeAuth
+    Esys_NV_ChangeAuth_Async
+    Esys_NV_ChangeAuth_Finish
+    Esys_NV_DefineSpace
+    Esys_NV_DefineSpace_Async
+    Esys_NV_DefineSpace_Finish
+    Esys_NV_Extend
+    Esys_NV_Extend_Async
+    Esys_NV_Extend_Finish
+    Esys_NV_GlobalWriteLock
+    Esys_NV_GlobalWriteLock_Async
+    Esys_NV_GlobalWriteLock_Finish
+    Esys_NV_Increment
+    Esys_NV_Increment_Async
+    Esys_NV_Increment_Finish
+    Esys_NV_Read
+    Esys_NV_ReadLock
+    Esys_NV_ReadLock_Async
+    Esys_NV_ReadLock_Finish
+    Esys_NV_ReadPublic
+    Esys_NV_ReadPublic_Async
+    Esys_NV_ReadPublic_Finish
+    Esys_NV_Read_Async
+    Esys_NV_Read_Finish
+    Esys_NV_SetBits
+    Esys_NV_SetBits_Async
+    Esys_NV_SetBits_Finish
+    Esys_NV_UndefineSpace
+    Esys_NV_UndefineSpaceSpecial
+    Esys_NV_UndefineSpaceSpecial_Async
+    Esys_NV_UndefineSpaceSpecial_Finish
+    Esys_NV_UndefineSpace_Async
+    Esys_NV_UndefineSpace_Finish
+    Esys_NV_Write
+    Esys_NV_WriteLock
+    Esys_NV_WriteLock_Async
+    Esys_NV_WriteLock_Finish
+    Esys_NV_Write_Async
+    Esys_NV_Write_Finish
+    Esys_ObjectChangeAuth
+    Esys_ObjectChangeAuth_Async
+    Esys_ObjectChangeAuth_Finish
+    Esys_PCR_Allocate
+    Esys_PCR_Allocate_Async
+    Esys_PCR_Allocate_Finish
+    Esys_PCR_Event
+    Esys_PCR_Event_Async
+    Esys_PCR_Event_Finish
+    Esys_PCR_Extend
+    Esys_PCR_Extend_Async
+    Esys_PCR_Extend_Finish
+    Esys_PCR_Read
+    Esys_PCR_Read_Async
+    Esys_PCR_Read_Finish
+    Esys_PCR_Reset
+    Esys_PCR_Reset_Async
+    Esys_PCR_Reset_Finish
+    Esys_PCR_SetAuthPolicy
+    Esys_PCR_SetAuthPolicy_Async
+    Esys_PCR_SetAuthPolicy_Finish
+    Esys_PCR_SetAuthValue
+    Esys_PCR_SetAuthValue_Async
+    Esys_PCR_SetAuthValue_Finish
+    Esys_PP_Commands
+    Esys_PP_Commands_Async
+    Esys_PP_Commands_Finish
+    Esys_PolicyAuthValue
+    Esys_PolicyAuthValue_Async
+    Esys_PolicyAuthValue_Finish
+    Esys_PolicyAuthorize
+    Esys_PolicyAuthorizeNV
+    Esys_PolicyAuthorizeNV_Async
+    Esys_PolicyAuthorizeNV_Finish
+    Esys_PolicyAuthorize_Async
+    Esys_PolicyAuthorize_Finish
+    Esys_PolicyCommandCode
+    Esys_PolicyCommandCode_Async
+    Esys_PolicyCommandCode_Finish
+    Esys_PolicyCounterTimer
+    Esys_PolicyCounterTimer_Async
+    Esys_PolicyCounterTimer_Finish
+    Esys_PolicyCpHash
+    Esys_PolicyCpHash_Async
+    Esys_PolicyCpHash_Finish
+    Esys_PolicyDuplicationSelect
+    Esys_PolicyDuplicationSelect_Async
+    Esys_PolicyDuplicationSelect_Finish
+    Esys_PolicyGetDigest
+    Esys_PolicyGetDigest_Async
+    Esys_PolicyGetDigest_Finish
+    Esys_PolicyLocality
+    Esys_PolicyLocality_Async
+    Esys_PolicyLocality_Finish
+    Esys_PolicyNV
+    Esys_PolicyNV_Async
+    Esys_PolicyNV_Finish
+    Esys_PolicyNameHash
+    Esys_PolicyNameHash_Async
+    Esys_PolicyNameHash_Finish
+    Esys_PolicyNvWritten
+    Esys_PolicyNvWritten_Async
+    Esys_PolicyNvWritten_Finish
+    Esys_PolicyOR
+    Esys_PolicyOR_Async
+    Esys_PolicyOR_Finish
+    Esys_PolicyPCR
+    Esys_PolicyPCR_Async
+    Esys_PolicyPCR_Finish
+    Esys_PolicyPassword
+    Esys_PolicyPassword_Async
+    Esys_PolicyPassword_Finish
+    Esys_PolicyPhysicalPresence
+    Esys_PolicyPhysicalPresence_Async
+    Esys_PolicyPhysicalPresence_Finish
+    Esys_PolicyRestart
+    Esys_PolicyRestart_Async
+    Esys_PolicyRestart_Finish
+    Esys_PolicySecret
+    Esys_PolicySecret_Async
+    Esys_PolicySecret_Finish
+    Esys_PolicySigned
+    Esys_PolicySigned_Async
+    Esys_PolicySigned_Finish
+    Esys_PolicyTemplate
+    Esys_PolicyTemplate_Async
+    Esys_PolicyTemplate_Finish
+    Esys_PolicyTicket
+    Esys_PolicyTicket_Async
+    Esys_PolicyTicket_Finish
+    Esys_Quote
+    Esys_Quote_Async
+    Esys_Quote_Finish
+    Esys_RSA_Decrypt
+    Esys_RSA_Decrypt_Async
+    Esys_RSA_Decrypt_Finish
+    Esys_RSA_Encrypt
+    Esys_RSA_Encrypt_Async
+    Esys_RSA_Encrypt_Finish
+    Esys_ReadClock
+    Esys_ReadClock_Async
+    Esys_ReadClock_Finish
+    Esys_ReadPublic
+    Esys_ReadPublic_Async
+    Esys_ReadPublic_Finish
+    Esys_Rewrap
+    Esys_Rewrap_Async
+    Esys_Rewrap_Finish
+    Esys_SelfTest
+    Esys_SelfTest_Async
+    Esys_SelfTest_Finish
+    Esys_SequenceComplete
+    Esys_SequenceComplete_Async
+    Esys_SequenceComplete_Finish
+    Esys_SequenceUpdate
+    Esys_SequenceUpdate_Async
+    Esys_SequenceUpdate_Finish
+    Esys_SetAlgorithmSet
+    Esys_SetAlgorithmSet_Async
+    Esys_SetAlgorithmSet_Finish
+    Esys_SetCommandCodeAuditStatus
+    Esys_SetCommandCodeAuditStatus_Async
+    Esys_SetCommandCodeAuditStatus_Finish
+    Esys_SetPrimaryPolicy
+    Esys_SetPrimaryPolicy_Async
+    Esys_SetPrimaryPolicy_Finish
+    Esys_SetTimeout
+    Esys_Shutdown
+    Esys_Shutdown_Async
+    Esys_Shutdown_Finish
+    Esys_Sign
+    Esys_Sign_Async
+    Esys_Sign_Finish
+    Esys_StartAuthSession
+    Esys_StartAuthSession_Async
+    Esys_StartAuthSession_Finish
+    Esys_Startup
+    Esys_Startup_Async
+    Esys_Startup_Finish
+    Esys_StirRandom
+    Esys_StirRandom_Async
+    Esys_StirRandom_Finish
+    Esys_TRSess_GetAttributes
+    Esys_TRSess_GetNonceTPM
+    Esys_TRSess_SetAttributes
+    Esys_TR_Close
+    Esys_TR_Deserialize
+    Esys_TR_FromTPMPublic
+    Esys_TR_FromTPMPublic_Async
+    Esys_TR_FromTPMPublic_Finish
+    Esys_TR_GetName
+    Esys_TR_Serialize
+    Esys_TR_SetAuth
+    Esys_TestParms
+    Esys_TestParms_Async
+    Esys_TestParms_Finish
+    Esys_Unseal
+    Esys_Unseal_Async
+    Esys_Unseal_Finish
+    Esys_VerifySignature
+    Esys_VerifySignature_Async
+    Esys_VerifySignature_Finish
+    Esys_ZGen_2Phase
+    Esys_ZGen_2Phase_Async
+    Esys_ZGen_2Phase_Finish
\ No newline at end of file
diff --git a/lib/tss2-mu.def b/lib/tss2-mu.def
index 60f68af5..5d49fba5 100644
--- a/lib/tss2-mu.def
+++ b/lib/tss2-mu.def
@@ -92,6 +92,8 @@ EXPORTS
     Tss2_MU_TPM2B_NONCE_Unmarshal
     Tss2_MU_TPM2B_OPERAND_Marshal
     Tss2_MU_TPM2B_OPERAND_Unmarshal
+    Tss2_MU_TPM2B_TEMPLATE_Marshal
+    Tss2_MU_TPM2B_TEMPLATE_Unmarshal
     Tss2_MU_TPM2B_TIMEOUT_Marshal
     Tss2_MU_TPM2B_TIMEOUT_Unmarshal
     Tss2_MU_TPMS_CONTEXT_Marshal
diff --git a/lib/tss2-sys.def b/lib/tss2-sys.def
index c10103be..3c6d9a1c 100644
--- a/lib/tss2-sys.def
+++ b/lib/tss2-sys.def
@@ -45,6 +45,8 @@ EXPORTS
     Tss2_Sys_Create_Prepare
     Tss2_Sys_Create_Complete
     Tss2_Sys_Create
+    Tss2_Sys_CreateLoaded_Prepare
+    Tss2_Sys_CreateLoaded_Complete
     Tss2_Sys_CreatePrimary_Prepare
     Tss2_Sys_CreatePrimary_Complete
     Tss2_Sys_CreatePrimary
@@ -81,6 +83,8 @@ EXPORTS
     Tss2_Sys_EvictControl_Prepare
     Tss2_Sys_EvictControl_Complete
     Tss2_Sys_EvictControl
+    Tss2_Sys_ExecuteAsync
+    Tss2_Sys_ExecuteFinish
     Tss2_Sys_FieldUpgradeData_Prepare
     Tss2_Sys_FieldUpgradeData_Complete
     Tss2_Sys_FieldUpgradeData
@@ -100,13 +104,19 @@ EXPORTS
     Tss2_Sys_GetCommandAuditDigest_Prepare
     Tss2_Sys_GetCommandAuditDigest_Complete
     Tss2_Sys_GetCommandAuditDigest
+    Tss2_Sys_GetCommandCode
     Tss2_Sys_GetContextSize
+    Tss2_Sys_GetCpBuffer
+    Tss2_Sys_GetDecryptParam
     Tss2_Sys_GetRandom_Prepare
     Tss2_Sys_GetRandom_Complete
     Tss2_Sys_GetRandom
+    Tss2_Sys_GetRpBuffer
+    Tss2_Sys_GetRspAuths
     Tss2_Sys_GetSessionAuditDigest_Prepare
     Tss2_Sys_GetSessionAuditDigest_Complete
     Tss2_Sys_GetSessionAuditDigest
+    Tss2_Sys_GetTctiContext
     Tss2_Sys_GetTestResult_Prepare
     Tss2_Sys_GetTestResult_Complete
     Tss2_Sys_GetTestResult
@@ -216,6 +226,8 @@ EXPORTS
     Tss2_Sys_PolicyAuthorize_Prepare
     Tss2_Sys_PolicyAuthorize_Complete
     Tss2_Sys_PolicyAuthorize
+    Tss2_Sys_PolicyAuthorizeNV_Prepare
+    Tss2_Sys_PolicyAuthorizeNV_Complete
     Tss2_Sys_PolicyAuthValue_Prepare
     Tss2_Sys_PolicyAuthValue_Complete
     Tss2_Sys_PolicyAuthValue
@@ -267,6 +279,8 @@ EXPORTS
     Tss2_Sys_PolicySigned_Prepare
     Tss2_Sys_PolicySigned_Complete
     Tss2_Sys_PolicySigned
+    Tss2_Sys_PolicyTemplate_Prepare
+    Tss2_Sys_PolicyTemplate_Complete
     Tss2_Sys_PolicyTicket_Prepare
     Tss2_Sys_PolicyTicket_Complete
     Tss2_Sys_PolicyTicket
@@ -306,9 +320,11 @@ EXPORTS
     Tss2_Sys_SetAlgorithmSet_Prepare
     Tss2_Sys_SetAlgorithmSet_Complete
     Tss2_Sys_SetAlgorithmSet
+    Tss2_Sys_SetCmdAuths
     Tss2_Sys_SetCommandCodeAuditStatus_Prepare
     Tss2_Sys_SetCommandCodeAuditStatus_Complete
     Tss2_Sys_SetCommandCodeAuditStatus
+    Tss2_Sys_SetDecryptParam
     Tss2_Sys_SetPrimaryPolicy_Prepare
     Tss2_Sys_SetPrimaryPolicy_Complete
     Tss2_Sys_SetPrimaryPolicy
diff --git a/src/tss2-esys/esys_tcti_default.c b/src/tss2-esys/esys_tcti_default.c
index e9786888..b3885d0d 100644
--- a/src/tss2-esys/esys_tcti_default.c
+++ b/src/tss2-esys/esys_tcti_default.c
@@ -36,10 +36,12 @@ struct {
     { "libtss2-tcti-default.so", NULL, "", "Access libtss2-tcti-default.so" },
     { "libtss2-tcti-tabrmd.so", NULL, "", "Access libtss2-tcti-tabrmd.so" },
 #endif /* NO_DL */
+#ifndef _WIN32
     { .init = Tss2_Tcti_Device_Init, .conf = "/dev/tpmrm0",
       .description = "Access to /dev/tpmrm0" },
     { .init = Tss2_Tcti_Device_Init, .conf = "/dev/tpm0",
       .description = "Access to /dev/tpm0" },
+#endif /* _WIN32 */
     { .init = Tss2_Tcti_Mssim_Init, .conf = "host=localhost,port=2321",
       .description = "Access to Mssim-simulator for tcp://localhost:2321" },
 };
diff --git a/src/tss2-esys/tss2-esys.sln b/src/tss2-esys/tss2-esys.sln
new file mode 100644
index 00000000..66885e5f
--- /dev/null
+++ b/src/tss2-esys/tss2-esys.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2026
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tss2-esys", "tss2-esys.vcxproj", "{BE0516D7-994C-4133-BD91-A21239D8B087}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x64.ActiveCfg = Debug|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x64.Build.0 = Debug|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x86.ActiveCfg = Debug|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x86.Build.0 = Debug|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x64.ActiveCfg = Release|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x64.Build.0 = Release|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x86.ActiveCfg = Release|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2874B5A5-AF68-49BC-BF68-A804FE480ECE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/tss2-esys/tss2-esys.vcxproj b/src/tss2-esys/tss2-esys.vcxproj
new file mode 100644
index 00000000..424ede30
--- /dev/null
+++ b/src/tss2-esys/tss2-esys.vcxproj
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{BE0516D7-994C-4133-BD91-A21239D8B087}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>LLVM-vs2014</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>LLVM-vs2014</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>LLVM-vs2014</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>LLVM-vs2014</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <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|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\Program Files (x86)\GnuPG\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>$(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tcti-mssim.lib;C:\Program Files (x86)\GnuPG\lib\libgcrypt.imp;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-esys.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\Program Files (x86)\GnuPG\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tcti-mssim.lib;C:\Program Files (x86)\GnuPG\lib\libgcrypt.imp;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-esys.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\Program Files\GnuPG\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tcti-mssim.lib;C:\Program Files\GnuPG\lib\libgcrypt.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-esys.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\Program Files\GnuPG\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;NO_DL;strtok_r=strtok_s;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tcti-mssim.lib;C:\Program Files\GnuPG\lib\libgcrypt.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>$(SolutionDir)\lib\tss2-esys.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\util\log.c" />
+    <ClCompile Include="api\Esys_ActivateCredential.c" />
+    <ClCompile Include="api\Esys_Certify.c" />
+    <ClCompile Include="api\Esys_CertifyCreation.c" />
+    <ClCompile Include="api\Esys_ChangeEPS.c" />
+    <ClCompile Include="api\Esys_ChangePPS.c" />
+    <ClCompile Include="api\Esys_Clear.c" />
+    <ClCompile Include="api\Esys_ClearControl.c" />
+    <ClCompile Include="api\Esys_ClockRateAdjust.c" />
+    <ClCompile Include="api\Esys_ClockSet.c" />
+    <ClCompile Include="api\Esys_Commit.c" />
+    <ClCompile Include="api\Esys_ContextLoad.c" />
+    <ClCompile Include="api\Esys_ContextSave.c" />
+    <ClCompile Include="api\Esys_Create.c" />
+    <ClCompile Include="api\Esys_CreateLoaded.c" />
+    <ClCompile Include="api\Esys_CreatePrimary.c" />
+    <ClCompile Include="api\Esys_DictionaryAttackLockReset.c" />
+    <ClCompile Include="api\Esys_DictionaryAttackParameters.c" />
+    <ClCompile Include="api\Esys_Duplicate.c" />
+    <ClCompile Include="api\Esys_ECC_Parameters.c" />
+    <ClCompile Include="api\Esys_ECDH_KeyGen.c" />
+    <ClCompile Include="api\Esys_ECDH_ZGen.c" />
+    <ClCompile Include="api\Esys_EC_Ephemeral.c" />
+    <ClCompile Include="api\Esys_EncryptDecrypt.c" />
+    <ClCompile Include="api\Esys_EncryptDecrypt2.c" />
+    <ClCompile Include="api\Esys_EventSequenceComplete.c" />
+    <ClCompile Include="api\Esys_EvictControl.c" />
+    <ClCompile Include="api\Esys_FieldUpgradeData.c" />
+    <ClCompile Include="api\Esys_FieldUpgradeStart.c" />
+    <ClCompile Include="api\Esys_FirmwareRead.c" />
+    <ClCompile Include="api\Esys_FlushContext.c" />
+    <ClCompile Include="api\Esys_GetCapability.c" />
+    <ClCompile Include="api\Esys_GetCommandAuditDigest.c" />
+    <ClCompile Include="api\Esys_GetRandom.c" />
+    <ClCompile Include="api\Esys_GetSessionAuditDigest.c" />
+    <ClCompile Include="api\Esys_GetTestResult.c" />
+    <ClCompile Include="api\Esys_GetTime.c" />
+    <ClCompile Include="api\Esys_Hash.c" />
+    <ClCompile Include="api\Esys_HashSequenceStart.c" />
+    <ClCompile Include="api\Esys_HierarchyChangeAuth.c" />
+    <ClCompile Include="api\Esys_HierarchyControl.c" />
+    <ClCompile Include="api\Esys_HMAC.c" />
+    <ClCompile Include="api\Esys_HMAC_Start.c" />
+    <ClCompile Include="api\Esys_Import.c" />
+    <ClCompile Include="api\Esys_IncrementalSelfTest.c" />
+    <ClCompile Include="api\Esys_Load.c" />
+    <ClCompile Include="api\Esys_LoadExternal.c" />
+    <ClCompile Include="api\Esys_MakeCredential.c" />
+    <ClCompile Include="api\Esys_NV_Certify.c" />
+    <ClCompile Include="api\Esys_NV_ChangeAuth.c" />
+    <ClCompile Include="api\Esys_NV_DefineSpace.c" />
+    <ClCompile Include="api\Esys_NV_Extend.c" />
+    <ClCompile Include="api\Esys_NV_GlobalWriteLock.c" />
+    <ClCompile Include="api\Esys_NV_Increment.c" />
+    <ClCompile Include="api\Esys_NV_Read.c" />
+    <ClCompile Include="api\Esys_NV_ReadLock.c" />
+    <ClCompile Include="api\Esys_NV_ReadPublic.c" />
+    <ClCompile Include="api\Esys_NV_SetBits.c" />
+    <ClCompile Include="api\Esys_NV_UndefineSpace.c" />
+    <ClCompile Include="api\Esys_NV_UndefineSpaceSpecial.c" />
+    <ClCompile Include="api\Esys_NV_Write.c" />
+    <ClCompile Include="api\Esys_NV_WriteLock.c" />
+    <ClCompile Include="api\Esys_ObjectChangeAuth.c" />
+    <ClCompile Include="api\Esys_PCR_Allocate.c" />
+    <ClCompile Include="api\Esys_PCR_Event.c" />
+    <ClCompile Include="api\Esys_PCR_Extend.c" />
+    <ClCompile Include="api\Esys_PCR_Read.c" />
+    <ClCompile Include="api\Esys_PCR_Reset.c" />
+    <ClCompile Include="api\Esys_PCR_SetAuthPolicy.c" />
+    <ClCompile Include="api\Esys_PCR_SetAuthValue.c" />
+    <ClCompile Include="api\Esys_PolicyAuthorize.c" />
+    <ClCompile Include="api\Esys_PolicyAuthorizeNV.c" />
+    <ClCompile Include="api\Esys_PolicyAuthValue.c" />
+    <ClCompile Include="api\Esys_PolicyCommandCode.c" />
+    <ClCompile Include="api\Esys_PolicyCounterTimer.c" />
+    <ClCompile Include="api\Esys_PolicyCpHash.c" />
+    <ClCompile Include="api\Esys_PolicyDuplicationSelect.c" />
+    <ClCompile Include="api\Esys_PolicyGetDigest.c" />
+    <ClCompile Include="api\Esys_PolicyLocality.c" />
+    <ClCompile Include="api\Esys_PolicyNameHash.c" />
+    <ClCompile Include="api\Esys_PolicyNV.c" />
+    <ClCompile Include="api\Esys_PolicyNvWritten.c" />
+    <ClCompile Include="api\Esys_PolicyOR.c" />
+    <ClCompile Include="api\Esys_PolicyPassword.c" />
+    <ClCompile Include="api\Esys_PolicyPCR.c" />
+    <ClCompile Include="api\Esys_PolicyPhysicalPresence.c" />
+    <ClCompile Include="api\Esys_PolicyRestart.c" />
+    <ClCompile Include="api\Esys_PolicySecret.c" />
+    <ClCompile Include="api\Esys_PolicySigned.c" />
+    <ClCompile Include="api\Esys_PolicyTemplate.c" />
+    <ClCompile Include="api\Esys_PolicyTicket.c" />
+    <ClCompile Include="api\Esys_PP_Commands.c" />
+    <ClCompile Include="api\Esys_Quote.c" />
+    <ClCompile Include="api\Esys_ReadClock.c" />
+    <ClCompile Include="api\Esys_ReadPublic.c" />
+    <ClCompile Include="api\Esys_Rewrap.c" />
+    <ClCompile Include="api\Esys_RSA_Decrypt.c" />
+    <ClCompile Include="api\Esys_RSA_Encrypt.c" />
+    <ClCompile Include="api\Esys_SelfTest.c" />
+    <ClCompile Include="api\Esys_SequenceComplete.c" />
+    <ClCompile Include="api\Esys_SequenceUpdate.c" />
+    <ClCompile Include="api\Esys_SetAlgorithmSet.c" />
+    <ClCompile Include="api\Esys_SetCommandCodeAuditStatus.c" />
+    <ClCompile Include="api\Esys_SetPrimaryPolicy.c" />
+    <ClCompile Include="api\Esys_Shutdown.c" />
+    <ClCompile Include="api\Esys_Sign.c" />
+    <ClCompile Include="api\Esys_StartAuthSession.c" />
+    <ClCompile Include="api\Esys_Startup.c" />
+    <ClCompile Include="api\Esys_StirRandom.c" />
+    <ClCompile Include="api\Esys_TestParms.c" />
+    <ClCompile Include="api\Esys_Unseal.c" />
+    <ClCompile Include="api\Esys_Vendor_TCG_Test.c" />
+    <ClCompile Include="api\Esys_VerifySignature.c" />
+    <ClCompile Include="api\Esys_ZGen_2Phase.c" />
+    <ClCompile Include="esys_context.c" />
+    <ClCompile Include="esys_crypto.c" />
+    <ClCompile Include="esys_iutil.c" />
+    <ClCompile Include="esys_mu.c" />
+    <ClCompile Include="esys_tcti_default.c" />
+    <ClCompile Include="esys_tr.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\util\log.h" />
+    <ClInclude Include="esys_crypto.h" />
+    <ClInclude Include="esys_int.h" />
+    <ClInclude Include="esys_iutil.h" />
+    <ClInclude Include="esys_mu.h" />
+    <ClInclude Include="esys_tcti_default.h" />
+    <ClInclude Include="esys_types.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tss2-esys/tss2-esys.vcxproj.filters b/src/tss2-esys/tss2-esys.vcxproj.filters
new file mode 100644
index 00000000..ab2c92e1
--- /dev/null
+++ b/src/tss2-esys/tss2-esys.vcxproj.filters
@@ -0,0 +1,402 @@
+<?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;hh;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</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="esys_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="esys_crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="esys_iutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="esys_mu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="esys_tcti_default.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="esys_tr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ActivateCredential.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Certify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_CertifyCreation.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ChangeEPS.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ChangePPS.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Clear.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ClearControl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ClockRateAdjust.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ClockSet.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Commit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ContextLoad.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ContextSave.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Create.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_CreateLoaded.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_CreatePrimary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_DictionaryAttackLockReset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_DictionaryAttackParameters.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Duplicate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ECC_Parameters.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ECDH_KeyGen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ECDH_ZGen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_EC_Ephemeral.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_EncryptDecrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_EncryptDecrypt2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_EventSequenceComplete.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_EvictControl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_FieldUpgradeData.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_FieldUpgradeStart.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_FirmwareRead.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_FlushContext.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetCapability.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetCommandAuditDigest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetRandom.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetSessionAuditDigest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetTestResult.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_GetTime.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_HashSequenceStart.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_HierarchyChangeAuth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_HierarchyControl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_HMAC.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_HMAC_Start.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Import.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_IncrementalSelfTest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Load.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_LoadExternal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_MakeCredential.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_Certify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_ChangeAuth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_DefineSpace.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_Extend.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_GlobalWriteLock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_Increment.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_Read.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_ReadLock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_ReadPublic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_SetBits.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_UndefineSpace.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_UndefineSpaceSpecial.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_Write.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_NV_WriteLock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ObjectChangeAuth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_Allocate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_Event.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_Extend.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_Read.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_Reset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_SetAuthPolicy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PCR_SetAuthValue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyAuthorize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyAuthorizeNV.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyAuthValue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyCommandCode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyCounterTimer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyCpHash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyDuplicationSelect.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyGetDigest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyLocality.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyNameHash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyNV.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyNvWritten.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyOR.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyPassword.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyPCR.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyPhysicalPresence.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyRestart.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicySecret.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicySigned.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyTemplate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PolicyTicket.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_PP_Commands.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Quote.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ReadClock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ReadPublic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Rewrap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_RSA_Decrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_RSA_Encrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SelfTest.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SequenceComplete.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SequenceUpdate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SetAlgorithmSet.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SetCommandCodeAuditStatus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_SetPrimaryPolicy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Shutdown.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Sign.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_StartAuthSession.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Startup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_StirRandom.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_TestParms.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Unseal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_Vendor_TCG_Test.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_VerifySignature.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="api\Esys_ZGen_2Phase.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\log.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="esys_crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="esys_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="esys_iutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="esys_mu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="esys_tcti_default.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="esys_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\util\log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tss2-sys/tss2-sys.vcxproj b/src/tss2-sys/tss2-sys.vcxproj
index 3f9e8216..4c5975a3 100644
--- a/src/tss2-sys/tss2-sys.vcxproj
+++ b/src/tss2-sys/tss2-sys.vcxproj
@@ -32,7 +32,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\util\log.c" />
+    <ClCompile Include="api\Tss2_Sys_CreateLoaded.c" />
     <ClCompile Include="api\Tss2_Sys_GetRspAuths.c" />
+    <ClCompile Include="api\Tss2_Sys_PolicyAuthorizeNV.c" />
+    <ClCompile Include="api\Tss2_Sys_PolicyTemplate.c" />
     <ClCompile Include="api\Tss2_Sys_SetCmdAuths.c" />
     <ClCompile Include="api\Tss2_Sys_Initialize.c" />
     <ClCompile Include="api\Tss2_Sys_GetContextSize.c" />
diff --git a/tpm2-tss.sln b/tpm2-tss.sln
index 66734f16..a5426b07 100644
--- a/tpm2-tss.sln
+++ b/tpm2-tss.sln
@@ -15,6 +15,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tss2-tcti-mssim", "src\tss2
 		{A6D8F061-6827-492F-80C3-32C4DD4FC52E} = {A6D8F061-6827-492F-80C3-32C4DD4FC52E}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tss2-esys", "src\tss2-esys\tss2-esys.vcxproj", "{BE0516D7-994C-4133-BD91-A21239D8B087}"
+	ProjectSection(ProjectDependencies) = postProject
+		{10D9862F-0E36-4ACC-AF19-930B00A88A98} = {10D9862F-0E36-4ACC-AF19-930B00A88A98}
+		{A6D8F061-6827-492F-80C3-32C4DD4FC52E} = {A6D8F061-6827-492F-80C3-32C4DD4FC52E}
+		{89B6B774-2886-48CF-B1D0-534AC449E0FD} = {89B6B774-2886-48CF-B1D0-534AC449E0FD}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -47,6 +54,14 @@ Global
 		{89B6B774-2886-48CF-B1D0-534AC449E0FD}.Release|x64.Build.0 = Release|x64
 		{89B6B774-2886-48CF-B1D0-534AC449E0FD}.Release|x86.ActiveCfg = Release|Win32
 		{89B6B774-2886-48CF-B1D0-534AC449E0FD}.Release|x86.Build.0 = Release|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x64.ActiveCfg = Debug|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x64.Build.0 = Debug|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x86.ActiveCfg = Debug|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Debug|x86.Build.0 = Debug|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x64.ActiveCfg = Release|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x64.Build.0 = Release|x64
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x86.ActiveCfg = Release|Win32
+		{BE0516D7-994C-4133-BD91-A21239D8B087}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE