From 9f8017a276be7649f6e5782c90034172a4e4b2e5 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Thu, 21 Mar 2019 08:13:14 -0400
Subject: Fix missing GF2NT_233_Multiply_Reduce_CLMUL in the cursed DLL (GH
 #783) This should have been checked-in during GH #783 and PR #784. I think
 there was one mailing list message about missing symbols
 GF2NT_233_Multiply_Reduce_CLMUL and GF2NT_233_Square_Reduce_CLMUL. I missed
 it when attempting to reproduce the issue. I can duplicate it now using
 VS2013. I think the addition of CRYPTOPP_DLL caused the issue to surface.

---
 cryptdll.vcxproj         | 1 +
 cryptdll.vcxproj.filters | 3 +++
 gf2n_simd.cpp            | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 88360ed5..2a65a6b9 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -212,6 +212,7 @@
     <ClCompile Include="gcm.cpp" />
     <ClCompile Include="gcm_simd.cpp" />
     <ClCompile Include="gf2n.cpp" />
+    <ClCompile Include="gf2n_simd.cpp" />
     <ClCompile Include="gfpcrypt.cpp" />
     <ClCompile Include="hex.cpp" />
     <ClCompile Include="hmac.cpp" />
diff --git a/cryptdll.vcxproj.filters b/cryptdll.vcxproj.filters
index 23bf3f49..a4951a76 100644
--- a/cryptdll.vcxproj.filters
+++ b/cryptdll.vcxproj.filters
@@ -98,6 +98,9 @@
     <ClCompile Include="gf2n.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="gf2n_simd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="gfpcrypt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/gf2n_simd.cpp b/gf2n_simd.cpp
index 395a3c04..1d4d933f 100644
--- a/gf2n_simd.cpp
+++ b/gf2n_simd.cpp
@@ -21,6 +21,8 @@
 #include "pch.h"
 #include "config.h"
 
+#ifndef CRYPTOPP_IMPORTS
+
 #include "gf2n.h"
 
 #if (CRYPTOPP_CLMUL_AVAILABLE)
@@ -608,3 +610,5 @@ GF2NT_233_Square_Reduce_POWER8(const word* pA, word* pC)
 #endif
 
 NAMESPACE_END
+
+#endif  // CRYPTOPP_IMPORTS
\ No newline at end of file
-- 
cgit v1.2.1