Merge pull request #319 from dreusel/fix-FIPS_mode-undefined-reference

fix: remove code using FIPS_mode which is not available on all distros
yfinkelstein · Sep 17, 2022 · 39282d6 · 39282d6
2 parents f86ef1f + 1efafdb
commit 39282d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/deps/no-fipsmode.patch b/deps/no-fipsmode.patch
@@ -0,0 +1,9 @@
+diff -ur -p0 deps/zookeeper-client-c/src/zookeeper.c deps-patched/zookeeper-client-c/src/zookeeper.c
+--- deps/zookeeper-client-c/src/zookeeper.c	2022-09-10 16:36:21.122958700 +0200
++++ deps-patched/zookeeper-client-c/src/zookeeper.c	2022-09-10 16:32:05.092796200 +0200
+@@ -2595,5 +2594,0 @@ static int init_ssl_for_socket(zsock_t *
+-        if (FIPS_mode() == 0) {
+-            LOG_INFO(LOGCALLBACK(zh), "FIPS mode is OFF ");
+-        } else {
+-            LOG_INFO(LOGCALLBACK(zh), "FIPS mode is ON ");
+-        }
diff --git a/scripts/env.js b/scripts/env.js
@@ -34,6 +34,7 @@ const variables = {
     sourceFolder: `${rootFolder}/deps/zookeeper-client-c`,
     downloadedFileName,
     isWindows,
+    isLinux: process.platform === 'linux',
     isVerbose: !!process.env.ZK_INSTALL_VERBOSE,
 };
 

diff --git a/scripts/prepublish.js b/scripts/prepublish.js
@@ -18,6 +18,8 @@ function applyPatches() {
         shell.sed('-i', '#include "zookeeper_log.h"', '#include "zookeeper_log.h"\n#include "winport.h"\n', `${destination}/zk_log.c`);
         shell.sed('-i', '#include "zookeeper.h"', '#include "winport.h"\n#include "zookeeper.h"\n', `${destination}/zk_adaptor.h`);
         shell.sed('-i', '#include "zk_adaptor.h"', '#include "zk_adaptor.h"\n#include "winport.h"\n', `${destination}/zookeeper.c`);
+    } else if (env.isLinux) {
+        shell.exec(`patch -d ${env.rootFolder} -p0 --forward < ${env.workFolder}/no-fipsmode.patch`);
     }
 }