diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-10 17:12:53 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:36:06 -0800 |
| commit | 54891e0650e69f08832f75a40dc102efc6115d38 (patch) | |
| tree | 0e032a0b337767801f696cbaeacded267c694f32 /src/strongname | |
| parent | 396f7d43b3c0f3ca7034a6d1d9cd7d6914778a1e (diff) | |
| download | coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.gz coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.bz2 coreclr-54891e0650e69f08832f75a40dc102efc6115d38.zip | |
Remove always defined FEATURE_CORECLR
Diffstat (limited to 'src/strongname')
| -rw-r--r-- | src/strongname/inc/sncoreclr.h | 3 | ||||
| -rw-r--r-- | src/strongname/inc/strongnameholders.h | 2 | ||||
| -rw-r--r-- | src/strongname/inc/strongnameinternal.h | 4 | ||||
| -rw-r--r-- | src/strongname/inc/thekey.h | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/src/strongname/inc/sncoreclr.h b/src/strongname/inc/sncoreclr.h index a2f794b26a..1b84a32372 100644 --- a/src/strongname/inc/sncoreclr.h +++ b/src/strongname/inc/sncoreclr.h @@ -5,9 +5,6 @@ #ifndef _SNCORECLR_H #define _SNCORECLR_H -#if !defined(FEATURE_CORECLR) -#error sncoreclr.h should only be used on CoreCLR builds -#endif // !FEATURE_CORECLR void InitUtilcode(); diff --git a/src/strongname/inc/strongnameholders.h b/src/strongname/inc/strongnameholders.h index a439768e74..b6af80f583 100644 --- a/src/strongname/inc/strongnameholders.h +++ b/src/strongname/inc/strongnameholders.h @@ -21,7 +21,7 @@ void VoidStrongNameFreeBuffer(__in T *pBuffer) } NEW_WRAPPER_TEMPLATE1(StrongNameBufferHolder, VoidStrongNameFreeBuffer<_TYPE>); -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX) // Holder for HCRYPTPROV handles directly allocated from CAPI inline void ReleaseCapiProvider(HCRYPTPROV hProv) { diff --git a/src/strongname/inc/strongnameinternal.h b/src/strongname/inc/strongnameinternal.h index 614fdfb53a..5aae39daa2 100644 --- a/src/strongname/inc/strongnameinternal.h +++ b/src/strongname/inc/strongnameinternal.h @@ -35,7 +35,7 @@ bool StrongNameIsEcmaKey(const PublicKeyBlob &keyPublicKey); bool StrongNameIsTheKey(__in_ecount(cbKey) const BYTE *pbKey, DWORD cbKey); -#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX)) +#if defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX) // Verify the format of a public key blob bool StrongNameIsValidKeyPair(__in_ecount(cbKeyPair) const BYTE *pbKeyPair, DWORD cbKeyPair); @@ -45,9 +45,7 @@ bool GetBytesFromHex(LPCUTF8 szHexString, ULONG cchHexString, BYTE** buffer, ULO bool StrongNameCryptAcquireContext(HCRYPTPROV *phProv, LPCWSTR pwszContainer, LPCWSTR pwszProvider, DWORD dwProvType, DWORD dwFlags); #endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX) -#ifdef FEATURE_CORECLR bool StrongNameIsSilverlightPlatformKey(__in_ecount(cbKey) const BYTE *pbKey, DWORD cbKey); bool StrongNameIsSilverlightPlatformKey(const PublicKeyBlob &keyPublicKey); -#endif // FEATURE_CORECLR #endif // !_STRONGNAME_INTERNAL_H diff --git a/src/strongname/inc/thekey.h b/src/strongname/inc/thekey.h index 24d0375c5e..7a53f4713b 100644 --- a/src/strongname/inc/thekey.h +++ b/src/strongname/inc/thekey.h @@ -21,7 +21,6 @@ static const BYTE g_rbTheKey[] = static const BYTE g_rbTheKeyToken[] = {0xb0,0x3f,0x5f,0x7f,0x11,0xd5,0x0a,0x3a}; -#ifdef FEATURE_CORECLR static const BYTE g_rbTheSilverlightPlatformKey[] = { 0x00,0x24,0x00,0x00,0x04,0x80,0x00,0x00,0x94,0x00,0x00,0x00,0x06,0x02,0x00,0x00, @@ -100,5 +99,4 @@ static const BYTE g_rbTheMicrosoftXNAKeyToken[] = {0xCC,0xAC,0x92,0xED,0x87,0x3B #endif // for FEATURE_WINDOWSPHONE, we can add the Microsoft.Phone key and the Xna key to the list of blessed keys... -#endif // FEATURE_CORECLR |