Remove remaining strongname validation on Windows

CodeCLR always skips strongname validation. Some code for strong name validation was still compiled for Windows, but not for Unix. This change removes the differences between Windows and Unix by never compiling the strong name validation code in.

Commit migrated from https://github.com/dotnet/coreclr/commit/e73cc0e8b8d04eaa6f49fdd97fdb89f079fb0d07

diff --git a/src/coreclr/src/strongname/api/strongname.cpp b/src/coreclr/src/strongname/api/strongname.cpp
index e26199d..1a8ef65 100644 (file)
--- a/src/coreclr/src/strongname/api/strongname.cpp
+++ b/src/coreclr/src/strongname/api/strongname.cpp
@@ -113,9 +113,9 @@ enum StrongNameCachedCsp {
 // allocated lazily as needed.
 struct SN_THREAD_CTX {
     DWORD       m_dwLastError;
-#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#if !defined(FEATURE_CORECLR)
     HCRYPTPROV  m_hProv[CachedCspCount];
-#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX)
+#endif // !FEATURE_CORECLR
 };
 
 #endif // !DACCESS_COMPILE
@@ -199,7 +199,7 @@ struct SN_THREAD_CTX {
 #endif // FEATURE_WINDOWSPHONE
 #endif // FEATURE_CORECLR
 
-#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#if !defined(FEATURE_CORECLR)
 
 #ifdef FEATURE_STRONGNAME_MIGRATION
 #include "caparser.h"
@@ -4667,11 +4667,11 @@ ErrExit:
 
 #endif // #ifndef DACCESS_COMPILE
 
-#else // !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#else // !defined(FEATURE_CORECLR)
 
 #define InitStrongName() S_OK
 
-#endif // !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#endif // !defined(FEATURE_CORECLR)
 
 
 // Free buffer allocated by routines below.
@@ -4697,12 +4697,12 @@ SN_THREAD_CTX *GetThreadContext()
         if (pThreadCtx == NULL)
             return NULL;
         pThreadCtx->m_dwLastError = S_OK;
-#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#if !defined(FEATURE_CORECLR)
         for (ULONG i = 0; i < CachedCspCount; i++)
         {
             pThreadCtx->m_hProv[i] = NULL;
         }
-#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX)
+#endif // !FEATURE_CORECLR
 
         EX_TRY {
             ClrFlsSetValue(TlsIdx_StrongName, pThreadCtx);

diff --git a/src/coreclr/src/vm/pefile.cpp b/src/coreclr/src/vm/pefile.cpp
index 9875e58..220a3bb 100644 (file)
--- a/src/coreclr/src/vm/pefile.cpp
+++ b/src/coreclr/src/vm/pefile.cpp
@@ -4344,7 +4344,7 @@ void PEAssembly::VerifyStrongName()
 #endif // !defined(FEATURE_CORECLR)    
     else
     {
-#if defined(FEATURE_CORECLR) && (!defined(CROSSGEN_COMPILE) || defined(PLATFORM_UNIX))
+#if defined(FEATURE_CORECLR)
         // Runtime policy on CoreCLR is to skip verification of ALL assemblies
         m_flags |= PEFILE_SKIP_MODULE_HASH_CHECKS;
         m_fStrongNameVerified = TRUE;
@@ -4397,7 +4397,7 @@ void PEAssembly::VerifyStrongName()
 #endif
         }
 
-#endif // FEATURE_CORECLR && (!CROSSGEN_COMPILE || PLATFORM_UNIX)
+#endif // FEATURE_CORECLR
     }
 
     m_fStrongNameVerified = TRUE;

diff --git a/src/coreclr/src/vm/peimage.inl b/src/coreclr/src/vm/peimage.inl
index c2f6957..2f4d7d4 100644 (file)
--- a/src/coreclr/src/vm/peimage.inl
+++ b/src/coreclr/src/vm/peimage.inl
@@ -405,7 +405,7 @@ inline const BOOL PEImage::HasStrongNameSignature()
 
 #ifndef DACCESS_COMPILE
 
-#if !defined(FEATURE_CORECLR) || (defined(CROSSGEN_COMPILE) && !defined(PLATFORM_UNIX))
+#if !defined(FEATURE_CORECLR)
 inline const HRESULT PEImage::VerifyStrongName(DWORD* verifyOutputFlags)  
 {
     WRAPPER_NO_CONTRACT;
@@ -445,7 +445,7 @@ inline const HRESULT PEImage::VerifyStrongName(DWORD* verifyOutputFlags)
     }
     return hr;
 }    
-#endif // !FEATURE_CORECLR || (CROSSGEN_COMPILE && !PLATFORM_UNIX)
+#endif // !FEATURE_CORECLR
 
 #endif // !DACCESS_COMPILE