Commit 5d9953ea authored by Milan Broz's avatar Milan Broz

Fix crypt_backend_flags prototype.

Fix some configure messages.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@410 36d66b0a-2a48-0410-832c-cd162a569da5
parent e2fbcea5
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* Add compile time crypto backends implementation * Add compile time crypto backends implementation
(gcrypt, OpenSSL, NSS and userspace Linux kernel crypto api). (gcrypt, OpenSSL, NSS and userspace Linux kernel crypto api).
* Currently NSS is lacking ripemd160, cannot provide full plain compatibility. * 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 <mbroz@redhat.com> 2010-12-20 Milan Broz <mbroz@redhat.com>
* Version 1.2.0. * Version 1.2.0.
......
...@@ -102,6 +102,8 @@ AC_DEFUN([CONFIGURE_NSS], [ ...@@ -102,6 +102,8 @@ AC_DEFUN([CONFIGURE_NSS], [
AC_MSG_ERROR([Static build of cryptsetup is not supported with NSS.]), AC_MSG_ERROR([Static build of cryptsetup is not supported with NSS.]),
fi fi
AC_MSG_WARN([NSS backend does NOT provide backward compatibility (missing ripemd160 hash).])
PKG_CHECK_MODULES([NSS], [nss],, PKG_CHECK_MODULES([NSS], [nss],,
AC_MSG_ERROR('You need nss library')) AC_MSG_ERROR('You need nss library'))
CRYPTO_CFLAGS=$NSS_CFLAGS CRYPTO_CFLAGS=$NSS_CFLAGS
...@@ -161,7 +163,7 @@ LIBS=$saved_LIBS ...@@ -161,7 +163,7 @@ LIBS=$saved_LIBS
dnl Crypto backend configuration. dnl Crypto backend configuration.
AC_ARG_WITH([crypto_backend], 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 [], with_crypto_backend=gcrypt
) )
case $with_crypto_backend in case $with_crypto_backend in
......
...@@ -11,7 +11,7 @@ int crypt_backend_init(void); ...@@ -11,7 +11,7 @@ int crypt_backend_init(void);
#define CRYPT_BACKEND_KERNEL (1 << 0) /* Crypto uses kernel part, for benchmark */ #define CRYPT_BACKEND_KERNEL (1 << 0) /* Crypto uses kernel part, for benchmark */
uint32_t crypt_backend_flags(); uint32_t crypt_backend_flags(void);
/* HASH */ /* HASH */
int crypt_hash_size(const char *name); int crypt_hash_size(const char *name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment