diff options
| author | Dan Moseley <danmose@microsoft.com> | 2017-08-27 23:51:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 23:51:22 -0700 |
| commit | 5c07c5aa98f8a088bf25099f1ab2d38b59ea5478 (patch) | |
| tree | cca21075b126112fef646b28ff646cf9f5313516 /src/vm/comutilnative.h | |
| parent | 0db6d91ec163eb2ddc005d141fe13ee0df267af0 (diff) | |
| download | coreclr-5c07c5aa98f8a088bf25099f1ab2d38b59ea5478.tar.gz coreclr-5c07c5aa98f8a088bf25099f1ab2d38b59ea5478.tar.bz2 coreclr-5c07c5aa98f8a088bf25099f1ab2d38b59ea5478.zip | |
Remove always defined FEATURE_RANDOMIZE_STRING_HASHING define (#13491)
* Remove always defined FEATURE_RANDOMIZE_STRING_HASHING
* Fully remove randomized hashing
* Leftovers
* Remove additionalEntropy from HashSortKey as it was always 0
* Remove additionalEntropy from HashString as it was always 0
* Change to private, as not in fact called by reflection in .NET Core
* Fix build break due to FCDECLn
* Revert removed QCALL
* Remove unused strlen parameter
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 |