eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix library name for FIPS check.

Browse Source
This commit is contained in:
Milan Broz
2012-07-09 19:30:25 +02:00
parent 8eef5bde4f
commit 584d5b8d65
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -2,6 +2,7 @@
* Add --device-size option for reencryption tool. * Add --device-size option for reencryption tool.
* Switch to use unit suffix for --reduce-device-size option. * Switch to use unit suffix for --reduce-device-size option.
* Remove open device debugging feature (no longer needed). * Remove open device debugging feature (no longer needed).
* Fix library name for FIPS check.
2012-06-20 Milan Broz <gmazyland@gmail.com> 2012-06-20 Milan Broz <gmazyland@gmail.com>
* Version 1.5.0-rc2. * Version 1.5.0-rc2.

4
TODO
View File

@@ -1,7 +1,7 @@
Version 1.5.0: Version 1.6.0:
- Export wipe device functions - Export wipe device functions
- Support K/M suffixes for align payload (new switch?). - Support K/M suffixes for align payload (new switch?).
- FIPS patches (RNG, volume key restrictions, move changekey to library) - FIPS: move changekey to library
- online reencryption api? - online reencryption api?
- integrate more metadata formats - integrate more metadata formats
- TRIM for keyslots - TRIM for keyslots

5
configure.in
View File

@@ -4,6 +4,8 @@ AC_INIT([cryptsetup],[1.5.0-rc2])
dnl library version from <major>.<minor>.<release>[-<suffix>] dnl library version from <major>.<minor>.<release>[-<suffix>]
LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-) LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
LIBCRYPTSETUP_VERSION_INFO=7:0:3 LIBCRYPTSETUP_VERSION_INFO=7:0:3
dnl library file name for FIPS selfcheck
LIBCRYPTSETUP_VERSION_FIPS="libcryptsetup.so.4"
AC_CONFIG_SRCDIR(src/cryptsetup.c) AC_CONFIG_SRCDIR(src/cryptsetup.c)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@@ -69,6 +71,8 @@ AC_ARG_ENABLE([fips], AS_HELP_STRING([--enable-fips],[enable FIPS mode restricti
if test "x$with_fips" = "xyes"; then if test "x$with_fips" = "xyes"; then
AC_DEFINE(ENABLE_FIPS, 1, [Enable FIPS mode restrictions]) AC_DEFINE(ENABLE_FIPS, 1, [Enable FIPS mode restrictions])
AC_DEFINE_UNQUOTED(LIBCRYPTSETUP_VERSION_FIPS, ["$LIBCRYPTSETUP_VERSION_FIPS"],
[library file name for FIPS selfcheck])
if test "x$enable_static" = "xyes" -o "x$enable_static_cryptsetup" = "xyes" ; then if test "x$enable_static" = "xyes" -o "x$enable_static_cryptsetup" = "xyes" ; then
AC_MSG_ERROR([Static build is not compatible with FIPS.]) AC_MSG_ERROR([Static build is not compatible with FIPS.])
@@ -289,6 +293,7 @@ AC_SUBST([CRYPTO_STATIC_LIBS])
AC_SUBST([LIBCRYPTSETUP_VERSION]) AC_SUBST([LIBCRYPTSETUP_VERSION])
AC_SUBST([LIBCRYPTSETUP_VERSION_INFO]) AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])
AC_SUBST([LIBCRYPTSETUP_VERSION_FIPS])
dnl ========================================================================== dnl ==========================================================================
AC_ARG_ENABLE([dev-random], AS_HELP_STRING([--enable-dev-random], AC_ARG_ENABLE([dev-random], AS_HELP_STRING([--enable-dev-random],

2
lib/utils_fips.c
View File

@@ -52,7 +52,7 @@ static void crypt_fips_verify(struct crypt_device *cd,
void crypt_fips_libcryptsetup_check(struct crypt_device *cd) void crypt_fips_libcryptsetup_check(struct crypt_device *cd)
{ {
crypt_fips_verify(cd, "libcryptsetup.so", "crypt_init"); crypt_fips_verify(cd, LIBCRYPTSETUP_VERSION_FIPS, "crypt_init");
} }
void crypt_fips_self_check(struct crypt_device *cd) void crypt_fips_self_check(struct crypt_device *cd)