diff options
author | Christian Pointner <equinox@anytun.org> | 2014-06-21 19:48:12 +0000 |
---|---|---|
committer | Christian Pointner <equinox@anytun.org> | 2014-06-21 19:48:12 +0000 |
commit | b0eb467680943a45f7ef2346d37efce073b837b2 (patch) | |
tree | 6b26bf687a2e6fb22f57db12b7b14ea70a91a210 /src/configure | |
parent | fixed typo in description (diff) | |
parent | implemented key derivation in nettle (diff) |
merged nettle branch to trunk
Diffstat (limited to 'src/configure')
-rwxr-xr-x | src/configure | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/configure b/src/configure index 2d753eb..04d5ac2 100755 --- a/src/configure +++ b/src/configure @@ -61,7 +61,8 @@ print_usage() { echo " --examplesdir=<DIR> the path to the examples files (default: $PREFIX/share/examples)" echo " --no-examples dont't install example files" echo " --use-gcrypt use libgcrypt (this is the default)" - echo " --use-ssl-crypto use ssl crypto library instead of libgcrypt" + echo " --use-nettle use libnettle instead of libgcrypt" + echo " --use-ssl-crypto use openssl crypto library instead of libgcrypt" echo " --no-crypto disable crypto at all (only NULL cipher)" echo " --disable-passphrase disable master key and salt passphrase" echo " --enable-passphrase enable master key and salt passphrase" @@ -101,6 +102,9 @@ do --use-gcrypt) CRYPTO_LIB='gcrypt' ;; + --use-nettle) + CRYPTO_LIB='nettle' + ;; --use-ssl-crypto) CRYPTO_LIB='ssl' ;; @@ -169,8 +173,14 @@ esac case $CRYPTO_LIB in gcrypt) + CFLAGS=$CFLAGS' -DUSE_GCRYPT' LDFLAGS=$LDFLAGS' -lgcrypt' - echo "using libgcrypt library" + echo "using gcrypt library" + ;; + nettle) + CFLAGS=$CFLAGS' -DUSE_NETTLE' + LDFLAGS=$LDFLAGS' -lnettle' + echo "using nettle library" ;; ssl) CFLAGS=$CFLAGS' -DUSE_SSL_CRYPTO' |