From b93636021c494f2d2ff4316e97cc0ac3dc7025e9 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Sat, 15 Apr 2023 12:04:41 -0300
Subject: [PATCH] Disabling FIPS tests Fixing win32 builds

---
 PKGBUILD.mingw                        |  2 +-
 configure.ac                          | 13 -------------
 src/core/windows/util.c               |  2 +-
 src/include/config.h.in               |  1 -
 src/network_modules/openssl/context.c |  4 ----
 src/testprogram/testprogram.c         |  4 ----
 6 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/PKGBUILD.mingw b/PKGBUILD.mingw
index 998cfa3..26d4e3b 100644
--- a/PKGBUILD.mingw
+++ b/PKGBUILD.mingw
@@ -30,7 +30,7 @@ url="https://github.com/PerryWerneck/${_realname}"
 arch=(i686 x86_64)
 license=(LGPL-3.0-or-later)
 depends=(${MINGW_PACKAGE_PREFIX}-openssl)
-makedepends=(autoconf automake make libtool gzip dos2unix ${MINGW_PACKAGE_PREFIX}-openssl)
+makedepends=(autoconf automake make libtool pkgconf gzip dos2unix ${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-gettext ${MINGW_PACKAGE_PREFIX}-openssl)
 checkdepends=()
 
 provides=($pkgname) 
diff --git a/configure.ac b/configure.ac
index ffb4777..aafe2e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,19 +394,6 @@ dnl ---------------------------------------------------------------------------
 dnl SSL Security options
 dnl ---------------------------------------------------------------------------
 
-AC_ARG_ENABLE([fips],
-	[AS_HELP_STRING([--disable-fips], [Disable OpenSSL FIPS])],
-[
-	app_cv_fips="$enableval"
-],[
-	AC_CHECK_HEADER(openssl/fips.h, app_cv_fips="yes", AC_MSG_NOTICE(fips.h is not available))
-
-])
-
-if test "$app_cv_fips" == "yes"; then
-	AC_DEFINE(HAVE_FIPS_H, 1, [FIPS Header is available])
-fi
-
 AC_ARG_ENABLE([self-signed-cert-check],
 	[AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])],
 [
diff --git a/src/core/windows/util.c b/src/core/windows/util.c
index 5e0e919..d68ce83 100644
--- a/src/core/windows/util.c
+++ b/src/core/windows/util.c
@@ -317,7 +317,7 @@ char * lib3270_build_data_filename(const char *str, ...) {
 		}
 	}
 
-	if( *(instpath+strlen(instpath)-1) = '\\') {
+	if( *(instpath+strlen(instpath)-1) == '\\') {
 		instpath[strlen(instpath)-1] = 0;
 	}
 
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 8a78af1..5d83003 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -70,7 +70,6 @@
 	/* Security options */
 	#undef HAVE_LDAP
 	#undef HAVE_LIBSSL
-	#undef HAVE_FIPS_H
 
 	#undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
 
diff --git a/src/network_modules/openssl/context.c b/src/network_modules/openssl/context.c
index 5cab121..a911432 100644
--- a/src/network_modules/openssl/context.c
+++ b/src/network_modules/openssl/context.c
@@ -46,10 +46,6 @@
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>
 
-#ifdef HAVE_FIPS_H
-	#include <openssl/fips.h>
-#endif // HAVE_FIPS_H
-
 #ifndef SSL_ST_OK
 #define SSL_ST_OK 3
 #endif // !SSL_ST_OK
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
index 191ad31..3af3589 100644
--- a/src/testprogram/testprogram.c
+++ b/src/testprogram/testprogram.c
@@ -43,10 +43,6 @@
 #include <lib3270/charset.h>
 #include <stdio.h>
 
-#ifdef HAVE_FIPS_H
-	#include <openssl/fips.h>
-#endif // HAVE_FIPS_H
-
 #ifdef _WIN32
 	#include <lib3270/win32.h>
 #endif // _WIN32
--
libgit2 0.21.2