Cleanup

aws · Jan 19, 2024 · d10057f · d10057f
1 parent 8f946cf
commit d10057f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/aws-lc-fips-sys/builder/cmake_builder.rs b/aws-lc-fips-sys/builder/cmake_builder.rs
@@ -106,7 +106,6 @@ impl CmakeBuilder {
                 .map_err(|x| panic!("{}", x))
                 .unwrap();
             for (key, value) in env_map {
-                println!("ENV-{}={}", key.as_str(), value.as_str());
                 cmake_cfg.env(key, value);
             }
         }
@@ -178,7 +177,7 @@ impl CmakeBuilder {
 impl crate::Builder for CmakeBuilder {
     fn check_dependencies(&self) -> Result<(), String> {
         let mut missing_dependency = false;
-        if target_os() == "windows" && test_ninja_command() {
+        if target_os() == "windows" && !test_ninja_command() {
             eprintln!("Missing dependency: Ninja is required for FIPS on Windows.");
             missing_dependency = true;
         }

diff --git a/aws-lc-sys/include/rust_wrapper.h b/aws-lc-sys/include/rust_wrapper.h
@@ -8,9 +8,9 @@
 
 #ifdef _WIN32
 #define BORINGSSL_SHARED_LIBRARY
-#define AWS_LC_FIPS_SYS_EXPORT __declspec(dllexport)
+#define AWS_LC_SYS_EXPORT __declspec(dllexport)
 #else
-#define AWS_LC_FIPS_SYS_EXPORT __attribute__((visibility("default")))
+#define AWS_LC_SYS_EXPORT __attribute__((visibility("default")))
 #endif
 
 #include <openssl/err.h>
@@ -23,9 +23,9 @@ extern "C" {
 // The following functions are wrappers over inline functions and macros in
 // BoringSSL, which bindgen cannot currently correctly bind. These wrappers
 // ensure changes to the functions remain in lockstep with the Rust versions.
-AWS_LC_FIPS_SYS_EXPORT int ERR_GET_LIB_RUST(uint32_t packed_error);
-AWS_LC_FIPS_SYS_EXPORT int ERR_GET_REASON_RUST(uint32_t packed_error);
-AWS_LC_FIPS_SYS_EXPORT int ERR_GET_FUNC_RUST(uint32_t packed_error);
+AWS_LC_SYS_EXPORT int ERR_GET_LIB_RUST(uint32_t packed_error);
+AWS_LC_SYS_EXPORT int ERR_GET_REASON_RUST(uint32_t packed_error);
+AWS_LC_SYS_EXPORT int ERR_GET_FUNC_RUST(uint32_t packed_error);
 
 
 #if defined(__cplusplus)