Add in fixes for FIPS version

Author: Andras Fekete

provider-fips.conf

@@ -0,0 +1,14 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+alg_section = algorithm_sect
+
+[provider_sect]
+libwolfprov = libwolfprov_sect
+
+[libwolfprov_sect]
+activate = 1
+
+[algorithm_sect]
+default_properties = fips=yes

scripts/utils-openssl.sh

@@ -122,7 +122,7 @@ init_openssl() {
     OPENSSL_BIN=${OPENSSL_INSTALL_DIR}/bin/openssl
     OPENSSL_TEST=${OPENSSL_SOURCE_DIR}/test
 
-    OSSL_VER=`LD_LIBRARY_PATH=${OPENSSL_INSTALL_DIR}/lib64 $OPENSSL_BIN version`
+    OSSL_VER=`LD_LIBRARY_PATH=${OPENSSL_INSTALL_DIR}/lib64 $OPENSSL_BIN version | tail -n1`
     case $OSSL_VER in
         OpenSSL\ 3.*) ;;
         *)

scripts/utils-wolfprovider.sh

@@ -25,11 +25,14 @@ source ${SCRIPT_DIR}/utils-wolfssl.sh
 
 WOLFPROV_SOURCE_DIR=${SCRIPT_DIR}/..
 WOLFPROV_INSTALL_DIR=${SCRIPT_DIR}/../wolfprov-install
-WOLFPROV_CONFIG=${WOLFPROV_CONFIG:-"$WOLFPROV_SOURCE_DIR/provider.conf"}
+if [ "$WOLFSSL_ISFIPS" -eq "1" ]; then
+    WOLFPROV_CONFIG=${WOLFPROV_CONFIG:-"$WOLFPROV_SOURCE_DIR/provider-fips.conf"}
+else
+    WOLFPROV_CONFIG=${WOLFPROV_CONFIG:-"$WOLFPROV_SOURCE_DIR/provider.conf"}
+fi
 
 WOLFPROV_NAME="libwolfprov"
 WOLFPROV_PATH=$WOLFPROV_INSTALL_DIR/lib
-export OPENSSL_MODULES=$WOLFPROV_PATH
 
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 
@@ -95,5 +98,8 @@ install_wolfprov() {
 init_wolfprov() {
     install_wolfprov
     printf "\twolfProvider installed in: ${WOLFPROV_INSTALL_DIR}\n"
+
+    export OPENSSL_MODULES=$WOLFPROV_PATH
+    export OPENSSL_CONF=${WOLFPROV_CONFIG}
 }