Disabling FIPS tests

Fixing win32 builds

Disabling FIPS tests
Fixing win32 builds
Perry Werneck
1 parent d310058a
Showing 6 changed files with 2 additions and 24 deletions Show diff stats
PKGBUILD.mingw
configure.ac
src/core/windows/util.c
src/include/config.h.in
src/network_modules/openssl/context.c
src/testprogram/testprogram.c
@@ -30,7 +30,7 @@ url=&quot;https://github.com/PerryWerneck/${_realname}&quot;
 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) 
@@ -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])],
 [
@@ -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;
 	}
  
@@ -70,7 +70,6 @@
 	/* Security options */
 	#undef HAVE_LDAP
 	#undef HAVE_LIBSSL
-	#undef HAVE_FIPS_H
  
 	#undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
  
@@ -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
@@ -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
...	...	@@ -30,7 +30,7 @@ url="https://github.com/PerryWerneck/${_realname}"
30	30	arch=(i686 x86_64)
31	31	license=(LGPL-3.0-or-later)
32	32	depends=(${MINGW_PACKAGE_PREFIX}-openssl)
33		-makedepends=(autoconf automake make libtool gzip dos2unix ${MINGW_PACKAGE_PREFIX}-openssl)
	33	+makedepends=(autoconf automake make libtool pkgconf gzip dos2unix ${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-gettext ${MINGW_PACKAGE_PREFIX}-openssl)
34	34	checkdepends=()
35	35
36	36	provides=($pkgname)
...	...
...	...	@@ -394,19 +394,6 @@ dnl ---------------------------------------------------------------------------
394	394	dnl SSL Security options
395	395	dnl ---------------------------------------------------------------------------
396	396
397		-AC_ARG_ENABLE([fips],
398		- [AS_HELP_STRING([--disable-fips], [Disable OpenSSL FIPS])],
399		-[
400		- app_cv_fips="$enableval"
401		-],[
402		- AC_CHECK_HEADER(openssl/fips.h, app_cv_fips="yes", AC_MSG_NOTICE(fips.h is not available))
403		-
404		-])
405		-
406		-if test "$app_cv_fips" == "yes"; then
407		- AC_DEFINE(HAVE_FIPS_H, 1, [FIPS Header is available])
408		-fi
409		-
410	397	AC_ARG_ENABLE([self-signed-cert-check],
411	398	[AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])],
412	399	[
...	...
...	...	@@ -317,7 +317,7 @@ char * lib3270_build_data_filename(const char *str, ...) {
317	317	}
318	318	}
319	319
320		- if( *(instpath+strlen(instpath)-1) = '\') {
	320	+ if( *(instpath+strlen(instpath)-1) == '\') {
321	321	instpath[strlen(instpath)-1] = 0;
322	322	}
323	323
...	...
...	...	@@ -70,7 +70,6 @@
70	70	/* Security options */
71	71	#undef HAVE_LDAP
72	72	#undef HAVE_LIBSSL
73		- #undef HAVE_FIPS_H
74	73
75	74	#undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
76	75
...	...
...	...	@@ -46,10 +46,6 @@
46	46	#include <openssl/err.h>
47	47	#include <openssl/x509_vfy.h>
48	48
49		-#ifdef HAVE_FIPS_H
50		- #include <openssl/fips.h>
51		-#endif // HAVE_FIPS_H
52		-
53	49	#ifndef SSL_ST_OK
54	50	#define SSL_ST_OK 3
55	51	#endif // !SSL_ST_OK
...	...
...	...	@@ -43,10 +43,6 @@
43	43	#include <lib3270/charset.h>
44	44	#include <stdio.h>
45	45
46		-#ifdef HAVE_FIPS_H
47		- #include <openssl/fips.h>
48		-#endif // HAVE_FIPS_H
49		-
50	46	#ifdef _WIN32
51	47	#include <lib3270/win32.h>
52	48	#endif // _WIN32
...	...