diff options
| author | Milan Broz <gmazyland@gmail.com> | 2015-08-21 13:20:43 +0200 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2015-08-26 10:36:49 +0200 |
| commit | 3a0293a299bbfcd8df7816d8c54683bae5c475de (patch) | |
| tree | 1051da692d75cb5626b7b7c712a16505cfd4e416 | |
| parent | 8a4db1ad7b9c2ac2c25faafd2c88f62277bd2bd1 (diff) | |
| download | cryptsetup-3a0293a299bbfcd8df7816d8c54683bae5c475de.tar.gz | |
Do not link FIPS helper to cryptsetup anymore.
Just print info about FIPS mode in RNG init.
| -rw-r--r-- | lib/random.c | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/cryptsetup.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/random.c b/lib/random.c index 25c8a2c..6a16a70 100644 --- a/lib/random.c +++ b/lib/random.c @@ -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: diff --git a/src/Makefile.am b/src/Makefile.am index ee0c814..5ed987d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \ diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 8fc4d6c..78f7313 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -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); |