Add FIPS-detecting option to feature-test helper

The '--have-fips' option of feature-test detects FIPS mode.

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index c4ba3a0266b3c22513c5f9b8d9701a2d735ebe9d..3998b0d6f7e401fa7ebefc298562b7842bc5625d 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -36,6 +36,11 @@ feature_test_CPPFLAGS =              \
        $(AM_CPPFLAGS)          \
        $(LIBDNS_CFLAGS)
 
+feature_test_LDADD =           \
+       $(LDADD)                \
+       $(LIBDNS_LIBS)          \
+       $(OPENSSL_LIBS)
+
 makejournal_CPPFLAGS =         \
        $(AM_CPPFLAGS)          \
        $(LIBDNS_CFLAGS)

diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index eb09f59f3348c4bc423514d147d51be166932468..82a7269f361e811520d2369099a6fb2a9e53d58c 100644 (file)
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <isc/fips.h>
 #include <isc/md.h>
 #include <isc/net.h>
 #include <isc/util.h>
@@ -33,6 +34,7 @@ usage(void) {
        fprintf(stderr, "\t--enable-querytrace\n");
        fprintf(stderr, "\t--gethostname\n");
        fprintf(stderr, "\t--gssapi\n");
+       fprintf(stderr, "\t--have-fips-mode\n");
        fprintf(stderr, "\t--have-geoip2\n");
        fprintf(stderr, "\t--have-json-c\n");
        fprintf(stderr, "\t--have-libxml2\n");
@@ -107,6 +109,14 @@ main(int argc, char **argv) {
 #endif /* HAVE_GSSAPI */
        }
 
+       if (strcmp(argv[1], "--have-fips-mode") == 0) {
+#if defined(ENABLE_FIPS_MODE)
+               return (0);
+#else
+               return (isc_fips_mode() ? 0 : 1);
+#endif
+       }
+
        if (strcmp(argv[1], "--have-geoip2") == 0) {
 #ifdef HAVE_GEOIP2
                return (0);