fix: invalid path in install_openssl3_fips.sh

snyk · Mar 1, 2024 · e4bf1eb · e4bf1eb
1 parent 0d1b5ba
commit e4bf1eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/environments/proxy/Dockerfile b/scripts/environments/proxy/Dockerfile
@@ -84,10 +84,11 @@ RUN /app/scripts/install-swift.sh $ARCH
 ENV PATH=/usr/local/swift/usr/bin:$PATH
 
 # install openssl3
-RUN /app/scripts/install_openssl3_fips.sh
+RUN /app/scripts/install_openssl3_fips.sh /app/
 ENV PATH=/usr/local/bin/:$PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib/
 
+RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 USER circleci
 
 # install deps
@@ -111,7 +112,6 @@ RUN ~/.cargo/bin/cargo install convco
 ENV PATH=/home/circleci/.cargo/bin:$PATH
 
 # setup proxy
-RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 ENV http_proxy="http://localhost:3128"
 ENV https_proxy="http://localhost:3128"
 ENV no_proxy "localhost,127.0.0.1"

diff --git a/scripts/install_openssl3_fips.sh b/scripts/install_openssl3_fips.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -ex
 
+APP_PATH="${1:-}"
+
 git clone https://github.com/openssl/openssl.git
 
 pushd .
@@ -12,7 +14,7 @@ export PATH=/usr/local/bin/:$PATH
 export LD_LIBRARY_PATH=/usr/local/lib/
 popd
 
-cp scripts/openssl.cnf /usr/local/ssl/openssl_fips_enabled.cnf
+cp ${APP_PATH}scripts/openssl.cnf /usr/local/ssl/openssl_fips_enabled.cnf
 chmod +r /usr/local/ssl/openssl_fips_enabled.cnf
 
 openssl fipsinstall -out /usr/local/ssl/fipsmodule.cnf -module /usr/local/lib/ossl-modules/fips.so