From 5d9953ea51d6b1d0b0ff12df796fcb8c8801dbc0 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 31 Dec 2010 14:34:01 +0000 Subject: [PATCH] Fix crypt_backend_flags prototype. Fix some configure messages. git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@410 36d66b0a-2a48-0410-832c-cd162a569da5 --- ChangeLog | 1 + configure.in | 4 +++- lib/crypto_backend/crypto_backend.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b276949..7ce2b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Add compile time crypto backends implementation (gcrypt, OpenSSL, NSS and userspace Linux kernel crypto api). * Currently NSS is lacking ripemd160, cannot provide full plain compatibility. + * Use --with-crypto_backend=[gcrypt|openssl|nss|kernel] to configure. 2010-12-20 Milan Broz * Version 1.2.0. diff --git a/configure.in b/configure.in index 5b0d44c..655db23 100644 --- a/configure.in +++ b/configure.in @@ -102,6 +102,8 @@ AC_DEFUN([CONFIGURE_NSS], [ AC_MSG_ERROR([Static build of cryptsetup is not supported with NSS.]), fi + AC_MSG_WARN([NSS backend does NOT provide backward compatibility (missing ripemd160 hash).]) + PKG_CHECK_MODULES([NSS], [nss],, AC_MSG_ERROR('You need nss library')) CRYPTO_CFLAGS=$NSS_CFLAGS @@ -161,7 +163,7 @@ LIBS=$saved_LIBS dnl Crypto backend configuration. AC_ARG_WITH([crypto_backend], - AS_HELP_STRING([--with-crypto_backend], [crypto backend (gcrypt/openssl/nss/kernel) [gcrypt]]), + AS_HELP_STRING([--with-crypto_backend=BACKEND], [crypto backend (gcrypt/openssl/nss/kernel) [gcrypt]]), [], with_crypto_backend=gcrypt ) case $with_crypto_backend in diff --git a/lib/crypto_backend/crypto_backend.h b/lib/crypto_backend/crypto_backend.h index f411131..006295c 100644 --- a/lib/crypto_backend/crypto_backend.h +++ b/lib/crypto_backend/crypto_backend.h @@ -11,7 +11,7 @@ int crypt_backend_init(void); #define CRYPT_BACKEND_KERNEL (1 << 0) /* Crypto uses kernel part, for benchmark */ -uint32_t crypt_backend_flags(); +uint32_t crypt_backend_flags(void); /* HASH */ int crypt_hash_size(const char *name); -- 2.7.4