Commit b93636021c494f2d2ff4316e97cc0ac3dc7025e9
1 parent
d310058a
Exists in
develop
Disabling FIPS tests
Fixing win32 builds
Showing
6 changed files
with
2 additions
and
24 deletions
Show diff stats
PKGBUILD.mingw
| @@ -30,7 +30,7 @@ url="https://github.com/PerryWerneck/${_realname}" | @@ -30,7 +30,7 @@ url="https://github.com/PerryWerneck/${_realname}" | ||
| 30 | arch=(i686 x86_64) | 30 | arch=(i686 x86_64) |
| 31 | license=(LGPL-3.0-or-later) | 31 | license=(LGPL-3.0-or-later) |
| 32 | depends=(${MINGW_PACKAGE_PREFIX}-openssl) | 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 | checkdepends=() | 34 | checkdepends=() |
| 35 | 35 | ||
| 36 | provides=($pkgname) | 36 | provides=($pkgname) |
configure.ac
| @@ -394,19 +394,6 @@ dnl --------------------------------------------------------------------------- | @@ -394,19 +394,6 @@ dnl --------------------------------------------------------------------------- | ||
| 394 | dnl SSL Security options | 394 | dnl SSL Security options |
| 395 | dnl --------------------------------------------------------------------------- | 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 | AC_ARG_ENABLE([self-signed-cert-check], | 397 | AC_ARG_ENABLE([self-signed-cert-check], |
| 411 | [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])], | 398 | [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])], |
| 412 | [ | 399 | [ |
src/core/windows/util.c
| @@ -317,7 +317,7 @@ char * lib3270_build_data_filename(const char *str, ...) { | @@ -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 | instpath[strlen(instpath)-1] = 0; | 321 | instpath[strlen(instpath)-1] = 0; |
| 322 | } | 322 | } |
| 323 | 323 |
src/include/config.h.in
src/network_modules/openssl/context.c
| @@ -46,10 +46,6 @@ | @@ -46,10 +46,6 @@ | ||
| 46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
| 47 | #include <openssl/x509_vfy.h> | 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 | #ifndef SSL_ST_OK | 49 | #ifndef SSL_ST_OK |
| 54 | #define SSL_ST_OK 3 | 50 | #define SSL_ST_OK 3 |
| 55 | #endif // !SSL_ST_OK | 51 | #endif // !SSL_ST_OK |
src/testprogram/testprogram.c
| @@ -43,10 +43,6 @@ | @@ -43,10 +43,6 @@ | ||
| 43 | #include <lib3270/charset.h> | 43 | #include <lib3270/charset.h> |
| 44 | #include <stdio.h> | 44 | #include <stdio.h> |
| 45 | 45 | ||
| 46 | -#ifdef HAVE_FIPS_H | ||
| 47 | - #include <openssl/fips.h> | ||
| 48 | -#endif // HAVE_FIPS_H | ||
| 49 | - | ||
| 50 | #ifdef _WIN32 | 46 | #ifdef _WIN32 |
| 51 | #include <lib3270/win32.h> | 47 | #include <lib3270/win32.h> |
| 52 | #endif // _WIN32 | 48 | #endif // _WIN32 |