Fix compilation errors

Author: Andras Fekete

include/wolfprovider/internal.h

@@ -38,6 +38,17 @@
 
 #include "wp_params.h"
 
+#ifndef AES_BLOCK_SIZE
+    #include <openssl/aes.h>
+    #ifndef AES_BLOCK_SIZE
+        #ifdef WC_NO_COMPAT_AES_BLOCK_SIZE
+            #define AES_BLOCK_SIZE WC_AES_BLOCK_SIZE
+        #else
+            #error AES_BLOCK_SIZE not defined when it should be
+        #endif
+    #endif
+#endif
+
 #ifndef WP_INTERNAL_H
 #define WP_INTERNAL_H
 

scripts/utils-wolfssl.sh

@@ -22,7 +22,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 source ${SCRIPT_DIR}/utils-general.sh
 
 WOLFSSL_GIT=${WOLFSSL_GIT:-"https://github.com/wolfSSL/wolfssl.git"}
-WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.7.2-stable"}
+WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.7.4-stable"}
 WOLFSSL_SOURCE_DIR=${SCRIPT_DIR}/../wolfssl-source
 WOLFSSL_INSTALL_DIR=${SCRIPT_DIR}/../wolfssl-install
 WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0}
@@ -78,10 +78,10 @@ install_wolfssl() {
         fi
         if [ "$WOLFSSL_ISFIPS" = "1" ]; then
             printf "with FIPS ... "
-            CONF_ARGS+=" --enable-fips=ready"
+            CONF_ARGS+=" --enable-fips=v5"
             if [ ! -e "XXX-fips-test" ]; then
                 # Sometimes the system OpenSSL is different than the one we're using. So for the 'git' commands, we'll just use whatever the system comes with
-                LD_LIBRARY_PATH="" ./fips-check.sh keep nomakecheck fips-ready >>$LOG_FILE 2>&1
+                LD_LIBRARY_PATH="" ./fips-check.sh keep nomakecheck linuxv5 >>$LOG_FILE 2>&1
                 if [ $? != 0 ]; then
                     printf "ERROR checking out FIPS\n"
                     rm -rf ${WOLFSSL_INSTALL_DIR}