diff options
Diffstat (limited to 'src/vm/comutilnative.h')
| -rw-r--r-- | src/vm/comutilnative.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/vm/comutilnative.h b/src/vm/comutilnative.h index 41df265e91..831e1c071e 100644 --- a/src/vm/comutilnative.h +++ b/src/vm/comutilnative.h @@ -27,7 +27,6 @@ #undef GetCurrentTime -#ifdef FEATURE_RANDOMIZED_STRING_HASHING #pragma warning(push) #pragma warning(disable:4324) #if !defined(CROSS_COMPILE) && defined(_TARGET_ARM_) && !defined(PLATFORM_UNIX) @@ -35,7 +34,6 @@ #endif #include "marvin32.h" #pragma warning(pop) -#endif // // @@ -260,33 +258,24 @@ class COMNlsHashProvider { public: COMNlsHashProvider(); - INT32 HashString(LPCWSTR szStr, SIZE_T strLen, BOOL forceRandomHashing, INT64 additionalEntropy); - INT32 HashSortKey(PCBYTE pSrc, SIZE_T cbSrc, BOOL forceRandomHashing, INT64 additionalEntropy); - INT32 HashiStringKnownLower80(LPCWSTR lpszStr, INT32 strLen, BOOL forceRandomHashing, INT64 additionalEntropy); + INT32 HashString(LPCWSTR szStr, SIZE_T strLen); + INT32 HashSortKey(PCBYTE pSrc, SIZE_T cbSrc); static COMNlsHashProvider s_NlsHashProvider; -#ifdef FEATURE_RANDOMIZED_STRING_HASHING - void SetUseRandomHashing(BOOL useRandomHashing) { LIMITED_METHOD_CONTRACT; bUseRandomHashing = useRandomHashing; } - BOOL GetUseRandomHashing() { LIMITED_METHOD_CONTRACT; return bUseRandomHashing; } - - private: - BOOL bUseRandomHashing; PBYTE pEntropy; PCSYMCRYPT_MARVIN32_EXPANDED_SEED pDefaultSeed; PCBYTE GetEntropy(); PCSYMCRYPT_MARVIN32_EXPANDED_SEED GetDefaultSeed(); void InitializeDefaultSeed(); - void CreateMarvin32Seed(INT64 additionalEntropy, PSYMCRYPT_MARVIN32_EXPANDED_SEED pExpandedMarvinSeed); -#endif // FEATURE_RANDOMIZED_STRING_HASHING }; #ifdef FEATURE_COREFX_GLOBALIZATION class CoreFxGlobalization { public: - static INT32 QCALLTYPE HashSortKey(PCBYTE pSortKey, INT32 cbSortKey, BOOL forceRandomizedHashing, INT64 additionalEntropy); + static INT32 QCALLTYPE HashSortKey(PCBYTE pSortKey, INT32 cbSortKey); }; #endif // FEATURE_COREFX_GLOBALIZATION |