diff options
| -rw-r--r-- | src/inc/holder.h | 10 | ||||
| -rw-r--r-- | src/strongname/api/strongnameinternal.cpp | 2 | ||||
| -rw-r--r-- | src/vm/rexcep.h | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/inc/holder.h b/src/inc/holder.h index 36a3dfc4af..cb0040549d 100644 --- a/src/inc/holder.h +++ b/src/inc/holder.h @@ -1211,16 +1211,6 @@ FORCEINLINE void VoidDeleteFile(LPCWSTR wszFilePath) { WszDeleteFile(wszFilePath typedef Wrapper<LPCWSTR, DoNothing<LPCWSTR>, VoidDeleteFile, NULL> DeleteFileHolder; #endif // WszDeleteFile -#if defined(FEATURE_CRYPTO) -// Crypto holders -FORCEINLINE void VoidCryptReleaseContext(HCRYPTPROV h) { CryptReleaseContext(h, 0); } -FORCEINLINE void VoidCryptDestroyHash(HCRYPTHASH h) { CryptDestroyHash(h); } -FORCEINLINE void VoidCryptDestroyKey(HCRYPTKEY h) { CryptDestroyKey(h); } - -typedef Wrapper<HCRYPTPROV, DoNothing, VoidCryptReleaseContext, 0> HandleCSPHolder; -typedef Wrapper<HCRYPTHASH, DoNothing, VoidCryptDestroyHash, 0> HandleHashHolder; -typedef Wrapper<HCRYPTKEY, DoNothing, VoidCryptDestroyKey, 0> HandleKeyHolder; -#endif // !FEATURE_CORECLR || FEATURE_CRYPTO //----------------------------------------------------------------------------- // Misc holders diff --git a/src/strongname/api/strongnameinternal.cpp b/src/strongname/api/strongnameinternal.cpp index 843436772c..0ace8a7c58 100644 --- a/src/strongname/api/strongnameinternal.cpp +++ b/src/strongname/api/strongnameinternal.cpp @@ -362,7 +362,7 @@ bool StrongNameCryptAcquireContext(HCRYPTPROV *phProv, LPCWSTR pwszContainer, LP { dwFlags &= ~CRYPT_MACHINE_KEYSET; } -#endif // FEATURE_CRYPTO +#endif // defined(CRYPT_VERIFYCONTEXT) && defined(CRYPT_MACHINE_KEYSET) return !!WszCryptAcquireContext(phProv, pwszContainer, pwszProvider, dwProvType, dwFlags); } diff --git a/src/vm/rexcep.h b/src/vm/rexcep.h index 77ff4e75f1..32a9d038fb 100644 --- a/src/vm/rexcep.h +++ b/src/vm/rexcep.h @@ -149,9 +149,9 @@ DEFINE_EXCEPTION(g_SystemNS, ContextMarshalException, false, C DEFINE_EXCEPTION(g_ReflectionNS, CustomAttributeFormatException, false, COR_E_CUSTOMATTRIBUTEFORMAT) -#if defined(FEATURE_X509) || defined(FEATURE_CRYPTO) +#if defined(FEATURE_X509) DEFINE_EXCEPTION(g_CryptographyNS, CryptographicException, false, CORSEC_E_CRYPTO) -#endif // FEATURE_X509 || FEATURE_CRYPTO +#endif // FEATURE_X509 DEFINE_EXCEPTION(g_SystemNS, DataMisalignedException, false, COR_E_DATAMISALIGNED) |