Commit 775de72903047ee845fc8227d6fff348218c70cb

Authored by Perry Werneck
1 parent a1d7eb31
Exists in master and in 1 other branch develop

Fixing build without FIPS on linux.

@@ -388,6 +388,8 @@ dnl --------------------------------------------------------------------------- @@ -388,6 +388,8 @@ dnl ---------------------------------------------------------------------------
388 dnl SSL Security options 388 dnl SSL Security options
389 dnl --------------------------------------------------------------------------- 389 dnl ---------------------------------------------------------------------------
390 390
  391 +AC_CHECK_HEADER(openssl/fips.h, AC_DEFINE(HAVE_FIPS_H, 1, [FIPS Header is available]), AC_MSG_NOTICE(fips.h is not available))
  392 +
391 AC_ARG_ENABLE([self-signed-cert-check], 393 AC_ARG_ENABLE([self-signed-cert-check],
392 [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])], 394 [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])],
393 [ 395 [
src/include/config.h.in
@@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@
70 /* Security options */ 70 /* Security options */
71 #undef HAVE_LDAP 71 #undef HAVE_LDAP
72 #undef HAVE_LIBSSL 72 #undef HAVE_LIBSSL
  73 + #undef HAVE_FIPS_H
73 74
74 #undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK 75 #undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
75 76
src/network_modules/openssl/context.c
@@ -45,7 +45,10 @@ @@ -45,7 +45,10 @@
45 45
46 #include <openssl/err.h> 46 #include <openssl/err.h>
47 #include <openssl/x509_vfy.h> 47 #include <openssl/x509_vfy.h>
48 -#include <openssl/fips.h> 48 +
  49 +#ifdef HAVE_FIPS_H
  50 + #include <openssl/fips.h>
  51 +#endif // HAVE_FIPS_H
49 52
50 #ifndef SSL_ST_OK 53 #ifndef SSL_ST_OK
51 #define SSL_ST_OK 3 54 #define SSL_ST_OK 3