Merge pull request #289 from Chia-Network/fuzzer

build fuzzer with hardening

Author: arvidn

rust_bindings/build.rs

@@ -1,4 +1,5 @@
 use std::env;
+use std::fs;
 use std::path::PathBuf;
 
 use cmake::Config;
@@ -10,6 +11,9 @@ fn main() {
 
     let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
 
+    let is_fuzzing = std::env::var("CARGO_CFG_FUZZING").is_ok();
+    let is_debug_build = std::env::var_os("OPT_LEVEL").unwrap_or("".into()) == "0";
+
     let mut src_dir = manifest_dir.join("cpp");
     if !src_dir.exists() {
         src_dir = manifest_dir
@@ -24,6 +28,14 @@ fn main() {
         .define("BUILD_CHIAVDFC", "ON")
         .env("BUILD_VDF_CLIENT", "N")
         .define("BUILD_PYTHON", "OFF")
+        .define(
+            "HARDENING",
+            if is_fuzzing || is_debug_build {
+                "ON"
+            } else {
+                "OFF"
+            },
+        )
         .build();
 
     println!("cargo:rustc-link-lib=static=chiavdfc");
@@ -48,6 +60,14 @@ fn main() {
                 .to_str()
                 .unwrap()
         );
+    } else if cfg!(target_os = "macos") {
+        println!("cargo:rustc-link-lib=static=gmp");
+        let homebrew_path = if fs::metadata("/opt/homebrew").is_ok() {
+            "/opt/homebrew/lib"
+        } else {
+            "/usr/local/lib"
+        };
+        println!("cargo:rustc-link-search=native={homebrew_path}");
     } else {
         println!("cargo:rustc-link-lib=gmp");
     }

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.14 FATAL_ERROR)
 option(BUILD_CHIAVDFC "Build the chiavdfc shared library" OFF)
 option(BUILD_PYTHON "Build the python bindings for chiavdf" ON)
+option(HARDENING "Enable hardening" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -108,6 +109,11 @@ if(BUILD_CHIAVDFC)
   target_link_libraries(chiavdfc_shared ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})
   target_link_libraries(chiavdfc_static ${GMP_LIBRARIES} ${GMPXX_LIBRARIES})
 
+    if (HARDENING)
+        target_compile_definitions(chiavdfc_shared PRIVATE "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG")
+        target_compile_definitions(chiavdfc_static PRIVATE "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG")
+    endif()
+
   set_target_properties(chiavdfc_shared PROPERTIES
           OUTPUT_NAME chiavdfc
           LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/shared$<0:>"