"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
cryptsetup-2.3.6.tar.xz and cryptsetup-2.4.0.tar.xz

About: cryptsetup is a utility used to conveniently setup disk encryption based on the dm-crypt kernel module. These include plain dm-crypt volumes, LUKS volumes, loop-AES and TrueCrypt compatible format.

configure.ac  (cryptsetup-2.3.6.tar.xz):configure.ac  (cryptsetup-2.4.0.tar.xz)
AC_PREREQ([2.67]) AC_PREREQ([2.67])
AC_INIT([cryptsetup],[2.3.6]) AC_INIT([cryptsetup],[2.4.0])
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=18:0:6 LIBCRYPTSETUP_VERSION_INFO=19:0:7
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR(src/cryptsetup.c) AC_CONFIG_SRCDIR(src/cryptsetup.c)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h:config.h.in]) AC_CONFIG_HEADERS([config.h:config.h.in])
# We do not want to run test in parallel. Really. # We do not want to run test in parallel. Really.
# http://lists.gnu.org/archive/html/automake/2013-01/msg00060.html # http://lists.gnu.org/archive/html/automake/2013-01/msg00060.html
# For old automake use this # For old automake use this
#AM_INIT_AUTOMAKE(dist-xz subdir-objects) #AM_INIT_AUTOMAKE(dist-xz subdir-objects)
AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests subdir-objects]) AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests subdir-objects foreign])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
sysconfdir=/etc sysconfdir=/etc
fi fi
AC_PREFIX_DEFAULT(/usr) AC_PREFIX_DEFAULT(/usr)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CPP AC_PROG_CPP
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_MKDIR_P
AC_ENABLE_STATIC(no) AC_ENABLE_STATIC(no)
LT_INIT LT_INIT
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AM_ICONV AM_ICONV
dnl ========================================================================== dnl ==========================================================================
dnl define PKG_CHECK_VAR for old pkg-config <= 0.28 dnl define PKG_CHECK_VAR for old pkg-config <= 0.28
m4_ifndef([AS_VAR_COPY], m4_ifndef([AS_VAR_COPY],
[m4_define([AS_VAR_COPY], [m4_define([AS_VAR_COPY],
[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
skipping to change at line 119 skipping to change at line 120
AC_C_CONST AC_C_CONST
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_TYPE_OFF_T AC_TYPE_OFF_T
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_FUNC_FSEEKO AC_FUNC_FSEEKO
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL
AC_FUNC_STRERROR_R AC_FUNC_STRERROR_R
dnl ========================================================================== dnl ==========================================================================
dnl LUKS2 external tokens
AC_ARG_ENABLE([external-tokens],
AS_HELP_STRING([--disable-external-tokens], [disable external LUKS2 token
s]),
[], [enable_external_tokens=yes])
if test "x$enable_external_tokens" = "xyes"; then
AC_DEFINE(USE_EXTERNAL_TOKENS, 1, [Use external tokens])
fi
AC_ARG_ENABLE([ssh-token],
AS_HELP_STRING([--disable-ssh-token], [disable LUKS2 ssh-token]),
[], [enable_ssh_token=yes])
AM_CONDITIONAL(SSHPLUGIN_TOKEN, test "x$enable_ssh_token" = "xyes")
if test "x$enable_ssh_token" = "xyes" -a "x$enable_external_tokens" = "xno"; the
n
AC_MSG_ERROR([Requested LUKS2 ssh-token build, but external tokens are di
sabled.])
fi
dnl ==========================================================================
AM_GNU_GETTEXT([external],[need-ngettext]) AM_GNU_GETTEXT([external],[need-ngettext])
AM_GNU_GETTEXT_VERSION([0.18.3]) AM_GNU_GETTEXT_VERSION([0.18.3])
dnl ========================================================================== dnl ==========================================================================
saved_LIBS=$LIBS saved_LIBS=$LIBS
AC_CHECK_LIB(popt, poptConfigFileToString,, AC_CHECK_LIB(popt, poptConfigFileToString,,
[AC_MSG_ERROR([You need popt 1.7 or newer to compile.])]) [AC_MSG_ERROR([You need popt 1.7 or newer to compile.])])
AC_SUBST(POPT_LIBS, $LIBS) AC_SUBST(POPT_LIBS, $LIBS)
skipping to change at line 383 skipping to change at line 403
AC_DEFINE(USE_UDEV, 1, [Try to use udev synchronisation?]) AC_DEFINE(USE_UDEV, 1, [Try to use udev synchronisation?])
fi fi
fi fi
LIBS=$saved_LIBS LIBS=$saved_LIBS
dnl Check for JSON-C used in LUKS2 dnl Check for JSON-C used in LUKS2
PKG_CHECK_MODULES([JSON_C], [json-c]) PKG_CHECK_MODULES([JSON_C], [json-c])
AC_CHECK_DECLS([json_object_object_add_ex], [], [], [#include <json-c/json.h>]) AC_CHECK_DECLS([json_object_object_add_ex], [], [], [#include <json-c/json.h>])
AC_CHECK_DECLS([json_object_deep_copy], [], [], [#include <json-c/json.h>]) AC_CHECK_DECLS([json_object_deep_copy], [], [], [#include <json-c/json.h>])
dnl Check for libssh for SSH plugin
if test "x$enable_ssh_token" = "xyes"; then
PKG_CHECK_MODULES([LIBSSH], [libssh])
AC_CHECK_DECLS([ssh_session_is_known_server], [], [], [#include <libssh/l
ibssh.h>])
fi
dnl Crypto backend configuration. dnl Crypto backend configuration.
AC_ARG_WITH([crypto_backend], AC_ARG_WITH([crypto_backend],
AS_HELP_STRING([--with-crypto_backend=BACKEND], [crypto backend (gcrypt/o penssl/nss/kernel/nettle) [openssl]]), AS_HELP_STRING([--with-crypto_backend=BACKEND], [crypto backend (gcrypt/o penssl/nss/kernel/nettle) [openssl]]),
[], [with_crypto_backend=openssl]) [], [with_crypto_backend=openssl])
dnl Kernel crypto API backend needed for benchmark and tcrypt dnl Kernel crypto API backend needed for benchmark and tcrypt
AC_ARG_ENABLE([kernel_crypto], AC_ARG_ENABLE([kernel_crypto],
AS_HELP_STRING([--disable-kernel_crypto], [disable kernel userspace crypt o (no benchmark and tcrypt)]), AS_HELP_STRING([--disable-kernel_crypto], [disable kernel userspace crypt o (no benchmark and tcrypt)]),
[], [enable_kernel_crypto=yes]) [], [enable_kernel_crypto=yes])
skipping to change at line 539 skipping to change at line 565
AC_SUBST([PASSWDQC_LIBS]) AC_SUBST([PASSWDQC_LIBS])
AC_SUBST([CRYPTO_CFLAGS]) AC_SUBST([CRYPTO_CFLAGS])
AC_SUBST([CRYPTO_LIBS]) AC_SUBST([CRYPTO_LIBS])
AC_SUBST([CRYPTO_STATIC_LIBS]) AC_SUBST([CRYPTO_STATIC_LIBS])
AC_SUBST([JSON_C_LIBS]) AC_SUBST([JSON_C_LIBS])
AC_SUBST([LIBARGON2_LIBS]) AC_SUBST([LIBARGON2_LIBS])
AC_SUBST([BLKID_LIBS]) AC_SUBST([BLKID_LIBS])
AC_SUBST([LIBSSH_LIBS])
AC_SUBST([LIBCRYPTSETUP_VERSION]) AC_SUBST([LIBCRYPTSETUP_VERSION])
AC_SUBST([LIBCRYPTSETUP_VERSION_INFO]) AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])
dnl ========================================================================== dnl ==========================================================================
AC_ARG_ENABLE([dev-random], AC_ARG_ENABLE([dev-random],
AS_HELP_STRING([--enable-dev-random], [use /dev/random by default for key generation (otherwise use /dev/urandom)])) AS_HELP_STRING([--enable-dev-random], [use /dev/random by default for key generation (otherwise use /dev/urandom)]))
if test "x$enable_dev_random" = "xyes"; then if test "x$enable_dev_random" = "xyes"; then
default_rng=/dev/random default_rng=/dev/random
else else
default_rng=/dev/urandom default_rng=/dev/urandom
skipping to change at line 594 skipping to change at line 622
CS_STR_WITH([luks1-mode], [cipher mode for LUKS1], [xts-plain64]) CS_STR_WITH([luks1-mode], [cipher mode for LUKS1], [xts-plain64])
CS_NUM_WITH([luks1-keybits],[key length in bits for LUKS1], [256]) CS_NUM_WITH([luks1-keybits],[key length in bits for LUKS1], [256])
AC_ARG_ENABLE([luks_adjust_xts_keysize], AS_HELP_STRING([--disable-luks-adjust-x ts-keysize], AC_ARG_ENABLE([luks_adjust_xts_keysize], AS_HELP_STRING([--disable-luks-adjust-x ts-keysize],
[XTS mode requires two keys, double default LUKS keysize if needed]), [XTS mode requires two keys, double default LUKS keysize if needed]),
[], [enable_luks_adjust_xts_keysize=yes]) [], [enable_luks_adjust_xts_keysize=yes])
if test "x$enable_luks_adjust_xts_keysize" = "xyes"; then if test "x$enable_luks_adjust_xts_keysize" = "xyes"; then
AC_DEFINE(ENABLE_LUKS_ADJUST_XTS_KEYSIZE, 1, [XTS mode - double default L UKS keysize if needed]) AC_DEFINE(ENABLE_LUKS_ADJUST_XTS_KEYSIZE, 1, [XTS mode - double default L UKS keysize if needed])
fi fi
CS_STR_WITH([luks2-pbkdf], [Default PBKDF algorithm (pbkdf2 or argon2i /argon2id) for LUKS2], [argon2i]) CS_STR_WITH([luks2-pbkdf], [Default PBKDF algorithm (pbkdf2 or argon2i /argon2id) for LUKS2], [argon2id])
CS_NUM_WITH([luks1-iter-time], [PBKDF2 iteration time for LUKS1 (in ms)], [2000]) CS_NUM_WITH([luks1-iter-time], [PBKDF2 iteration time for LUKS1 (in ms)], [2000])
CS_NUM_WITH([luks2-iter-time], [Argon2 PBKDF iteration time for LUKS2 (in ms)], [2000]) CS_NUM_WITH([luks2-iter-time], [Argon2 PBKDF iteration time for LUKS2 (in ms)], [2000])
CS_NUM_WITH([luks2-memory-kb], [Argon2 PBKDF memory cost for LUKS2 (in kB) ], [1048576]) CS_NUM_WITH([luks2-memory-kb], [Argon2 PBKDF memory cost for LUKS2 (in kB) ], [1048576])
CS_NUM_WITH([luks2-parallel-threads],[Argon2 PBKDF max parallel cost for LUKS2 ( if CPUs available)], [4]) CS_NUM_WITH([luks2-parallel-threads],[Argon2 PBKDF max parallel cost for LUKS2 ( if CPUs available)], [4])
CS_STR_WITH([luks2-keyslot-cipher], [fallback cipher for LUKS2 keyslot (if data encryption is incompatible)], [aes-xts-plain64]) CS_STR_WITH([luks2-keyslot-cipher], [fallback cipher for LUKS2 keyslot (if data encryption is incompatible)], [aes-xts-plain64])
CS_NUM_WITH([luks2-keyslot-keybits],[fallback key size for LUKS2 keyslot (if dat a encryption is incompatible)], [512]) CS_NUM_WITH([luks2-keyslot-keybits],[fallback key size for LUKS2 keyslot (if dat a encryption is incompatible)], [512])
CS_STR_WITH([loopaes-cipher], [cipher for loop-AES mode], [aes]) CS_STR_WITH([loopaes-cipher], [cipher for loop-AES mode], [aes])
CS_NUM_WITH([loopaes-keybits],[key length in bits for loop-AES mode], [256]) CS_NUM_WITH([loopaes-keybits],[key length in bits for loop-AES mode], [256])
skipping to change at line 636 skipping to change at line 664
test -z "$with_luks2_lock_path" && with_luks2_lock_path=/run/cryptsetup test -z "$with_luks2_lock_path" && with_luks2_lock_path=/run/cryptsetup
CS_ABSPATH([${with_luks2_lock_path}],[with-luks2-lock-path]) CS_ABSPATH([${with_luks2_lock_path}],[with-luks2-lock-path])
DEFAULT_LUKS2_LOCK_PATH=$with_luks2_lock_path DEFAULT_LUKS2_LOCK_PATH=$with_luks2_lock_path
AC_SUBST(DEFAULT_LUKS2_LOCK_PATH) AC_SUBST(DEFAULT_LUKS2_LOCK_PATH)
CS_NUM_WITH([luks2-lock-dir-perms], [default luks2 locking directory permissions ], [0700]) CS_NUM_WITH([luks2-lock-dir-perms], [default luks2 locking directory permissions ], [0700])
test -z "$with_luks2_lock_dir_perms" && with_luks2_lock_dir_perms=0700 test -z "$with_luks2_lock_dir_perms" && with_luks2_lock_dir_perms=0700
DEFAULT_LUKS2_LOCK_DIR_PERMS=$with_luks2_lock_dir_perms DEFAULT_LUKS2_LOCK_DIR_PERMS=$with_luks2_lock_dir_perms
AC_SUBST(DEFAULT_LUKS2_LOCK_DIR_PERMS) AC_SUBST(DEFAULT_LUKS2_LOCK_DIR_PERMS)
CS_STR_WITH([luks2-external-tokens-path], [path to directory with LUKSv2 externa
l token handlers (plugins)], [LIBDIR/cryptsetup])
if test -n "$with_luks2_external_tokens_path"; then
CS_ABSPATH([${with_luks2_external_tokens_path}],[with-luks2-external-toke
ns-path])
EXTERNAL_LUKS2_TOKENS_PATH=$with_luks2_external_tokens_path
else
EXTERNAL_LUKS2_TOKENS_PATH="\${libdir}/cryptsetup"
fi
AC_SUBST(EXTERNAL_LUKS2_TOKENS_PATH)
dnl Override default LUKS format version (for cryptsetup or cryptsetup-reencrypt format actions only). dnl Override default LUKS format version (for cryptsetup or cryptsetup-reencrypt format actions only).
AC_ARG_WITH([default_luks_format], AC_ARG_WITH([default_luks_format],
AS_HELP_STRING([--with-default-luks-format=FORMAT], [default LUKS format version (LUKS1/LUKS2) [LUKS2]]), AS_HELP_STRING([--with-default-luks-format=FORMAT], [default LUKS format version (LUKS1/LUKS2) [LUKS2]]),
[], [with_default_luks_format=LUKS2]) [], [with_default_luks_format=LUKS2])
case $with_default_luks_format in case $with_default_luks_format in
LUKS1) default_luks=CRYPT_LUKS1 ;; LUKS1) default_luks=CRYPT_LUKS1 ;;
LUKS2) default_luks=CRYPT_LUKS2 ;; LUKS2) default_luks=CRYPT_LUKS2 ;;
*) AC_MSG_ERROR([Unknown default LUKS format. Use LUKS1 or LUKS2 only.]) ;; *) AC_MSG_ERROR([Unknown default LUKS format. Use LUKS1 or LUKS2 only.]) ;;
esac esac
 End of changes. 9 change blocks. 
4 lines changed or deleted 47 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)