From 4921664f92bb6bd39ed7fd3dd24d58108973af25 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 1 Nov 2020 15:16:07 -0600 Subject: Stop encrypting hidden variables. They were persisted in plaintext, and always had to be decrypted and sent to a separate process to actually be used. --- src/test/BurnUnitTest/VariantTest.cpp | 50 ++++------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) (limited to 'src/test/BurnUnitTest') diff --git a/src/test/BurnUnitTest/VariantTest.cpp b/src/test/BurnUnitTest/VariantTest.cpp index 34328f53..43899a2b 100644 --- a/src/test/BurnUnitTest/VariantTest.cpp +++ b/src/test/BurnUnitTest/VariantTest.cpp @@ -68,7 +68,7 @@ namespace Bootstrapper } private: - void InitFormattedValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) + void InitFormattedValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) { HRESULT hr = S_OK; pValue->Type = BURN_VARIANT_TYPE_FORMATTED; @@ -78,34 +78,18 @@ namespace Bootstrapper hr = BVariantCopy(pValue, pActualValue); NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); - - if (fHidden) - { - hr = BVariantSetEncryption(pActualValue, TRUE); - NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); - - NativeAssert::True(pActualValue->fEncryptString); - } } - void InitNoneValue(BURN_VARIANT* pValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) + void InitNoneValue(BURN_VARIANT* pValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) { HRESULT hr = S_OK; pValue->Type = BURN_VARIANT_TYPE_NONE; hr = BVariantCopy(pValue, pActualValue); NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); - - if (fHidden) - { - hr = BVariantSetEncryption(pActualValue, TRUE); - NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); - - NativeAssert::True(pActualValue->fEncryptString); - } } - void InitNumericValue(BURN_VARIANT* pValue, LONGLONG llValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) + void InitNumericValue(BURN_VARIANT* pValue, LONGLONG llValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) { HRESULT hr = S_OK; pValue->Type = BURN_VARIANT_TYPE_NUMERIC; @@ -113,17 +97,9 @@ namespace Bootstrapper hr = BVariantCopy(pValue, pActualValue); NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); - - if (fHidden) - { - hr = BVariantSetEncryption(pActualValue, TRUE); - NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); - - NativeAssert::True(pActualValue->fEncryptString); - } } - void InitStringValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) + void InitStringValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) { HRESULT hr = S_OK; pValue->Type = BURN_VARIANT_TYPE_STRING; @@ -133,17 +109,9 @@ namespace Bootstrapper hr = BVariantCopy(pValue, pActualValue); NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); - - if (fHidden) - { - hr = BVariantSetEncryption(pActualValue, TRUE); - NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); - - NativeAssert::True(pActualValue->fEncryptString); - } } - void InitVersionValue(BURN_VARIANT* pValue, LPCWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) + void InitVersionValue(BURN_VARIANT* pValue, LPCWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) { HRESULT hr = S_OK; VERUTIL_VERSION* pVersion = NULL; @@ -159,14 +127,6 @@ namespace Bootstrapper hr = BVariantCopy(pValue, pActualValue); NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); - - if (fHidden) - { - hr = BVariantSetEncryption(pActualValue, TRUE); - NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); - - NativeAssert::True(pActualValue->fEncryptString); - } } finally { -- cgit v1.2.3-55-g6feb