From faecf7f8499aec8de511c2bd95921ef84bfe9869 Mon Sep 17 00:00:00 2001 From: toddouska Date: Wed, 19 Mar 2014 10:19:08 -0700 Subject: [PATCH] require thread local storage for power on self thread check --- configure.ac | 6 +++++- ctaocrypt/src/fips.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 ctaocrypt/src/fips.c diff --git a/configure.ac b/configure.ac index f0ec16cea..634885ba2 100644 --- a/configure.ac +++ b/configure.ac @@ -1060,13 +1060,17 @@ AM_CONDITIONAL([BUILD_RABBIT], [test "x$ENABLED_RABBIT" = "xyes"]) # FIPS AC_ARG_ENABLE([fips], - [ --enable-fips Enable FIPS 140-2(default: disabled)], + [ --enable-fips Enable FIPS 140-2 (default: disabled)], [ ENABLED_FIPS=$enableval ], [ ENABLED_FIPS=no ] ) if test "x$ENABLED_FIPS" = "xyes" then + if test "$thread_ls_on" = "no" + then + AC_MSG_ERROR([FIPS requires Thread Local Storage]) + fi AM_CFLAGS="$AM_CFLAGS -DHAVE_FIPS" fi diff --git a/ctaocrypt/src/fips.c b/ctaocrypt/src/fips.c deleted file mode 100644 index 8ef4c4276..000000000 --- a/ctaocrypt/src/fips.c +++ /dev/null @@ -1 +0,0 @@ -/* dummy fips.c */