diff options
author | Christian Pointner <equinox@anytun.org> | 2014-06-22 23:09:15 +0000 |
---|---|---|
committer | Christian Pointner <equinox@anytun.org> | 2014-06-22 23:09:15 +0000 |
commit | fac90fc49e667b18522b442ff15edd3bb8eb804b (patch) | |
tree | 7530b98b4b7c50f0512184e9a2369a0b196306a7 /src/keyDerivation.h | |
parent | fixed typo in license header (diff) | |
parent | implemented key derivation using libnettle (diff) |
merged nettle featuer branch to trunk
Diffstat (limited to 'src/keyDerivation.h')
-rw-r--r-- | src/keyDerivation.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/keyDerivation.h b/src/keyDerivation.h index accb501..96904d1 100644 --- a/src/keyDerivation.h +++ b/src/keyDerivation.h @@ -40,11 +40,15 @@ #include "options.h" #ifndef NO_CRYPT -#ifndef USE_SSL_CRYPTO -#include <gcrypt.h> -#else + +#if defined(USE_SSL_CRYPTO) #include <openssl/aes.h> +#elif defined(USE_NETTLE) +#include <nettle/aes.h> +#else // USE_GCRYPT is the default +#include <gcrypt.h> #endif + #endif #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> @@ -168,11 +172,13 @@ private: ar& boost::serialization::base_object<KeyDerivation>(*this); } -#ifndef USE_SSL_CRYPTO - gcry_cipher_hd_t handle_[2]; -#else +#if defined(USE_SSL_CRYPTO) AES_KEY aes_key_[2]; uint8_t ecount_buf_[2][AES_BLOCK_SIZE]; +#elif defined(USE_NETTLE) + struct aes_ctx ctx_[2]; +#else // USE_GCRYPT is the default + gcry_cipher_hd_t handle_[2]; #endif #ifdef _MSC_VER |