Do not link FIPS helper to cryptsetup anymore.

Just print info about FIPS mode in RNG init.
This commit is contained in:
Milan Broz
2015-08-21 13:20:43 +02:00
parent 8a4db1ad7b
commit 3a0293a299
3 changed files with 3 additions and 4 deletions

View File

@@ -162,6 +162,9 @@ int crypt_random_init(struct crypt_device *ctx)
if(random_fd == -1)
goto fail;
if (crypt_fips_mode())
log_verbose(ctx, _("Running in FIPS mode.\n"));
random_initialised = 1;
return 0;
fail:

View File

@@ -12,7 +12,6 @@ AM_CPPFLAGS = -include config.h \
cryptsetup_SOURCES = \
$(top_builddir)/lib/utils_crypt.c \
$(top_builddir)/lib/utils_loop.c \
$(top_builddir)/lib/utils_fips.c \
utils_tools.c \
utils_password.c \
cryptsetup.c \

View File

@@ -1568,9 +1568,6 @@ int main(int argc, const char **argv)
usage(popt_context, EXIT_FAILURE, poptStrerror(r),
poptBadOption(popt_context, POPT_BADOPTION_NOALIAS));
if (crypt_fips_mode())
crypt_log(NULL, CRYPT_LOG_VERBOSE, _("Running in FIPS mode.\n"));
if (opt_version_mode) {
log_std("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
poptFreeContext(popt_context);