cryptopp: Apply ARM fix on MSVC (#26208)

* Apply ARM fix on MSVC

* Add missing patch file

* Add commit metadata

* Add ACLE backport

* Update recipes/cryptopp/all/patches/8.9.0-0001-cve-2023-50980.patch

* Cleanup

* Validate seems necessary for now

* CMake 4 support

* Validate older releases for windows arm

Author: AbrilRBS

recipes/cryptopp/all/conandata.yml

@@ -40,6 +40,12 @@ patches:
       patch_description: "Validate PolynomialMod2 coefficients (CVE-2023-50980)"
       patch_type: "vulnerability"
       patch_source: "https://github.com/weidai11/cryptopp/issues/1248"
+    - patch_file: "patches/8.9.0-0002-fix-cmake-msvc-arm64-detection.patch"
+      patch_source: "https://github.com/abdes/cryptopp-cmake/commit/1940cc0400de2e8161821558e73e3d8d0ddb13d3"
+    - patch_file: "patches/8.9.0-0003-fix-acle-header-usage-msvc-arm.patch"
+      patch_description: "Fix ACLE header detection on Windows ARM"
+      patch_type: "backport"
+      patch_source: "https://github.com/abdes/cryptopp-cmake/pull/127"
   "8.7.0":
     - patch_file: "patches/8.7.0-0001-fix-msvc-arm64.patch"
   "8.6.0":
@@ -50,4 +56,4 @@ patches:
   "8.5.0":
     - patch_file: "patches/8.4.0-0001-relocatable-macos.patch"
       patch_description: "Relocatable shared lib on macOS"
-      patch_type: "conan"
+      patch_type: "conan"

recipes/cryptopp/all/conanfile.py

@@ -5,14 +5,13 @@
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 from conan.tools.files import (
     apply_conandata_patches, collect_libs, copy, export_conandata_patches, get,
-    rename, replace_in_file, rmdir, save
+    rename, replace_in_file, rmdir
 )
 from conan.tools.scm import Version
 
 import os
-import textwrap
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=2"
 
 
 class CryptoPPConan(ConanFile):
@@ -36,28 +35,24 @@ class CryptoPPConan(ConanFile):
         "use_openmp": False,
     }
 
+    implements = ["auto_shared_fpic"]
+
     def export_sources(self):
         export_conandata_patches(self)
 
-    def config_options(self):
-        if self.settings.os == "Windows":
-            del self.options.fPIC
-
-    def configure(self):
-        if self.options.shared:
-            self.options.rm_safe("fPIC")
-
     def layout(self):
         cmake_layout(self, src_folder="src")
 
     def validate_build(self):
         if is_apple_os(self) and cross_building(self) and Version(self.version) <= "8.6.0":
             # See https://github.com/abdes/cryptopp-cmake/pull/38
             raise ConanInvalidConfiguration("cryptopp 8.6.0 and lower do not support cross-building on Apple platforms")
-    
+
     def validate(self):
         if self.options.shared and Version(self.version) >= "8.7.0":
             raise ConanInvalidConfiguration("cryptopp 8.7.0 and higher do not support shared builds")
+        if Version(self.version) < "8.9.0" and self.settings.os == "Windows" and self.settings.arch == "armv8":
+            raise ConanInvalidConfiguration("Older releases do not support Windows ARM")
 
     def build_requirements(self):
         if Version(self.version) >= "8.7.0":
@@ -82,6 +77,17 @@ def source(self):
             # Get cryptopp-cmake sources
             get(self, **self.conan_data["sources"][self.version]["cmake"],
                 destination=os.path.join(self.source_folder, "cryptopp-cmake"), strip_root=True)
+        self._patch_sources()
+
+    def _patch_sources(self):
+        apply_conandata_patches(self)
+        # Honor fPIC option
+        if Version(self.version) < "8.7.0":
+            replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
+                                "SET(CMAKE_POSITION_INDEPENDENT_CODE 1)", "")
+        else:
+            replace_in_file(self, os.path.join(self.source_folder, "cryptopp-cmake", "cryptopp", "CMakeLists.txt"),
+                                "set(CMAKE_POSITION_INDEPENDENT_CODE 1)", "")
 
     def generate(self):
         tc = CMakeToolchain(self)
@@ -108,10 +114,10 @@ def generate(self):
                 tc.cache_variables["CRYPTOPP_NATIVE_ARCH"] = True
             tc.cache_variables["CRYPTOPP_USE_OPENMP"] = self.options.use_openmp
         tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Git"] = True
+        tc.cache_variables["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5" # CMake 4 support
         tc.generate()
 
-    def _patch_sources(self):
-        apply_conandata_patches(self)
+    def _ensure_android_cpufeatures(self):
         # Use cpu-features.h from Android NDK
         if self.settings.os == "Android" and Version(self.version) < "8.4.0":
             # Replicate logic from: https://github.com/weidai11/cryptopp/blob/CRYPTOPP_8_2_0/cpu.cpp#L46-L52
@@ -124,16 +130,9 @@ def _patch_sources(self):
                     src=os.path.join(android_ndk_home, "sources", "android", "cpufeatures"),
                     dst=self.source_folder,
                 )
-        # Honor fPIC option
-        if Version(self.version) < "8.7.0":
-            replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
-                                "SET(CMAKE_POSITION_INDEPENDENT_CODE 1)", "")
-        else:
-            replace_in_file(self, os.path.join(self.source_folder, "cryptopp-cmake", "cryptopp", "CMakeLists.txt"),
-                                "set(CMAKE_POSITION_INDEPENDENT_CODE 1)", "")
 
     def build(self):
-        self._patch_sources()
+        self._ensure_android_cpufeatures()
         cmake = CMake(self)
         if Version(self.version) < "8.7.0":
             cmake.configure()
@@ -149,29 +148,6 @@ def package(self):
             rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
         else:
             rmdir(self, os.path.join(self.package_folder, "share"))
-        # TODO: to remove in conan v2 once cmake_find_package* generators removed
-        self._create_cmake_module_alias_targets(
-            os.path.join(self.package_folder, self._module_file_rel_path),
-            {
-                "cryptopp-shared": "cryptopp::cryptopp-shared",
-                "cryptopp-static": "cryptopp::cryptopp-static"
-            }
-        )
-
-    def _create_cmake_module_alias_targets(self, module_file, targets):
-        content = ""
-        for alias, aliased in targets.items():
-            content += textwrap.dedent(f"""\
-                if(TARGET {aliased} AND NOT TARGET {alias})
-                    add_library({alias} INTERFACE IMPORTED)
-                    set_property(TARGET {alias} PROPERTY INTERFACE_LINK_LIBRARIES {aliased})
-                endif()
-            """)
-        save(self, module_file, content)
-
-    @property
-    def _module_file_rel_path(self):
-        return os.path.join("lib", "cmake", f"conan-official-{self.name}-targets.cmake")
 
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "cryptopp")
@@ -195,11 +171,5 @@ def package_info(self):
                 self.cpp_info.components["libcryptopp"].sharedlinkflags = openmp_flag
                 self.cpp_info.components["libcryptopp"].exelinkflags = openmp_flag
 
-        # TODO: to remove in conan v2 once cmake_find_package* & pkg_config generators removed
-        self.cpp_info.names["pkg_config"] = "libcryptopp"
-        self.cpp_info.components["libcryptopp"].names["cmake_find_package"] = legacy_cmake_target
-        self.cpp_info.components["libcryptopp"].names["cmake_find_package_multi"] = legacy_cmake_target
-        self.cpp_info.components["libcryptopp"].build_modules["cmake_find_package"] = [self._module_file_rel_path]
-        self.cpp_info.components["libcryptopp"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path]
         self.cpp_info.components["libcryptopp"].set_property("cmake_target_name", "cryptopp::cryptopp")
         self.cpp_info.components["libcryptopp"].set_property("pkg_config_name", "libcryptopp")

recipes/cryptopp/all/patches/8.9.0-0001-cve-2023-50980.patch

@@ -2,6 +2,11 @@ https://github.com/weidai11/cryptopp/issues/1248
 https://github.com/weidai11/cryptopp/commit/eb383b8e1622
 https://github.com/weidai11/cryptopp/commit/641ae35258de
 https://github.com/weidai11/cryptopp/commit/93208e83937a
+
+---
+
+diff --git a/gf2n.cpp b/gf2n.cpp
+index 452e698..56c10de 100644
 --- a/gf2n.cpp
 +++ b/gf2n.cpp
 @@ -135,6 +135,14 @@ PolynomialMod2 PolynomialMod2::Monomial(size_t i)
@@ -62,6 +67,8 @@ https://github.com/weidai11/cryptopp/commit/93208e83937a
  }
 
  const GF2NT::Element& GF2NT233::Multiply(const Element &a, const Element &b) const
+diff --git a/gf2n.h b/gf2n.h
+index 4aef31e..38e2a91 100644
 --- a/gf2n.h
 +++ b/gf2n.h
 @@ -69,9 +69,11 @@ public:

recipes/cryptopp/all/patches/8.9.0-0002-fix-cmake-msvc-arm64-detection.patch

@@ -0,0 +1,20 @@
+From 1940cc0400de2e8161821558e73e3d8d0ddb13d3 Mon Sep 17 00:00:00 2001
+From: Steveice10 <[email protected]>
+Date: Thu, 25 Jan 2024 04:56:36 -0800
+Subject: [PATCH] build: fix compiling for ARM with MSVC but not Visual Studio
+ generator (#106)
+
+---
+diff --git a/cryptopp-cmake/cryptopp/CMakeLists.txt b/cryptopp-cmake/cryptopp/CMakeLists.txt
+index 7a78807..b64256f 100644
+--- a/cryptopp-cmake/cryptopp/CMakeLists.txt
++++ b/cryptopp-cmake/cryptopp/CMakeLists.txt
+@@ -1241,7 +1241,7 @@ set_source_files_properties(
+ # Compiler: MSVC
+ # ------------------------------------------------------------------------------
+ if(MSVC AND NOT CRYPTOPP_DISABLE_ASM)
+-    if(${CMAKE_GENERATOR_PLATFORM} MATCHES "ARM")
++    if(${CMAKE_GENERATOR_PLATFORM} MATCHES "ARM" OR CRYPTOPP_ARM32 OR CRYPTOPP_ARMV8)
+         message(
+             STATUS
+             "[cryptopp] Disabling ASM because ARM is specified as target platform."