Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc

[platform/upstream/cryptsetup.git] / configure.in

diff --git a/configure.in b/configure.in
index 93c4615..3345f0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 AC_PREREQ([2.67])
-AC_INIT([cryptsetup],[1.4.3-git])
+AC_INIT([cryptsetup],[1.5.0-rc1])
 
 dnl library version from <major>.<minor>.<release>[-<suffix>]
 LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
-LIBCRYPTSETUP_VERSION_INFO=5:0:1
+LIBCRYPTSETUP_VERSION_INFO=7:0:3
 
 AC_CONFIG_SRCDIR(src/cryptsetup.c)
 AC_CONFIG_MACRO_DIR([m4])
@@ -343,6 +343,11 @@ CS_NUM_WITH([loopaes-keybits],[key length in bits for loop-AES mode], [256])
 CS_NUM_WITH([keyfile-size-maxkb],[maximum keyfile size (in kilobytes)], [8192])
 CS_NUM_WITH([passphrase-size-max],[maximum keyfile size (in kilobytes)], [512])
 
+CS_STR_WITH([verity-hash],       [hash function for verity mode], [sha256])
+CS_NUM_WITH([verity-data-block], [data block size for verity mode], [4096])
+CS_NUM_WITH([verity-hash-block], [hash block size for verity mode], [4096])
+CS_NUM_WITH([verity-salt-size],  [salt size for verity mode], [32])
+
 dnl ==========================================================================
 
 AC_CONFIG_FILES([ Makefile
@@ -351,6 +356,7 @@ lib/libcryptsetup.pc
 lib/crypto_backend/Makefile
 lib/luks1/Makefile
 lib/loopaes/Makefile
+lib/verity/Makefile
 src/Makefile
 po/Makefile.in
 man/Makefile