@@ -133,14 +133,15 @@ RUN cd /usr/src/openbfdd && \
133133 ./configure --enable-silent-rules && \
134134 make
135135
136- ENV LD_LIBRARY_PATH=/usr/local/openssl-fips/lib64:$LD_LIBRARY_PATH
136+ ENV OPENSSL_FIPS_LIBDIR=/usr/local/openssl-fips/lib
137+ ENV LD_LIBRARY_PATH=$OPENSSL_FIPS_LIBDIR:$LD_LIBRARY_PATH
137138RUN wget https://www.openssl.org/source/openssl-3.0.13.tar.gz && \
138139 tar -xzf openssl-3.0.13.tar.gz && \
139140 cd openssl-3.0.13 && \
140- ./config --prefix=/usr/local/openssl-fips enable-fips && \
141+ ./config --prefix=/usr/local/openssl-fips --libdir=lib enable-fips && \
141142 make -j8 && \
142143 make install && \
143- /usr/local/openssl-fips/bin/openssl fipsinstall -module /usr/local/openssl-fips/lib64 /ossl-modules/fips.so -out /usr/local/openssl-fips/ssl/fipsmodule.cnf
144+ /usr/local/openssl-fips/bin/openssl fipsinstall -module $OPENSSL_FIPS_LIBDIR /ossl-modules/fips.so -out /usr/local/openssl-fips/ssl/fipsmodule.cnf
144145
145146RUN mkdir /packages/ && \
146147 mv /usr/src/openbfdd/bfdd-beacon /usr/src/openbfdd/bfdd-control /packages/ && \
@@ -233,8 +234,8 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages \
233234COPY --from=ovs-builder /usr/local/openssl-fips /usr/local/openssl-fips
234235# env OPENSSL_CONF is only work when user is root, not effect when user is nobody, maybe openssl bug, so we copy openssl binary and libraries to /usr/bin and /usr/lib/x86_64-linux-gnu
235236RUN cp /usr/local/openssl-fips/bin/openssl /usr/bin/openssl && \
236- cp /usr/local/openssl-fips/lib64 /libssl.so.3 /usr/lib/x86_64-linux-gnu/libssl.so.3 && \
237- cp /usr/local/openssl-fips/lib64 /libcrypto.so.3 /usr/lib/x86_64-linux-gnu/libcrypto.so.3 && \
238- cp /usr/local/openssl-fips/lib64 /ossl-modules/fips.so /usr/lib/x86_64-linux-gnu/ossl-modules/
237+ cp /usr/local/openssl-fips/lib /libssl.so.3 /usr/lib/x86_64-linux-gnu/libssl.so.3 && \
238+ cp /usr/local/openssl-fips/lib /libcrypto.so.3 /usr/lib/x86_64-linux-gnu/libcrypto.so.3 && \
239+ cp /usr/local/openssl-fips/lib /ossl-modules/fips.so /usr/lib/x86_64-linux-gnu/ossl-modules/
239240
240241ENTRYPOINT ["/usr/bin/dumb-init", "--"]
0 commit comments