summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2017-01-04 22:11:32 +0100
committerChristian Pointner <equinox@anytun.org>2017-01-04 22:11:32 +0100
commit1423045898bdea94dee99c5865b3a6257fafdf34 (patch)
tree7286c67bc9153063bf93a6f789c051a72ceb9e01
parentimprove build reproducibility (diff)
include crypto library in version output
-rwxr-xr-xsrc/configure16
-rw-r--r--src/options.c6
2 files changed, 14 insertions, 8 deletions
diff --git a/src/configure b/src/configure
index bd0cbaf..b94fdf2 100755
--- a/src/configure
+++ b/src/configure
@@ -183,28 +183,33 @@ case $TARGET in
;;
esac
-
+CRYPTO_LIB_NAME=""
case $CRYPTO_LIB in
gcrypt)
CFLAGS=$CFLAGS' -DUSE_GCRYPT'
LDFLAGS=$LDFLAGS' -lgcrypt'
- echo "using gcrypt library"
+ CRYPTO_LIB_NAME="libgcrypt"
;;
nettle)
CFLAGS=$CFLAGS' -DUSE_NETTLE'
LDFLAGS=$LDFLAGS' -lnettle'
- echo "using nettle library"
+ CRYPTO_LIB_NAME="Nettle"
;;
ssl)
CFLAGS=$CFLAGS' -DUSE_SSL_CRYPTO'
LDFLAGS=$LDFLAGS' -lcrypto'
- echo "using ssl crypto library"
+ CRYPTO_LIB_NAME="OpenSSL"
;;
none)
CFLAGS=$CFLAGS' -DNO_CRYPT'
- echo "disabling crypto"
+ CRYPTO_LIB_NAME="none"
+ ;;
+ *)
+ echo "unknown crypto library: $$CRYPTO_LIB"
+ exit 1
;;
esac
+echo "crypto-library: $CRYPTO_LIB_NAME"
if [ $PASSPHRASE -eq 0 ]; then
CFLAGS=$CFLAGS' -DNO_PASSPHRASE'
@@ -283,6 +288,7 @@ cat > version.h <<EOF
#define UANYTUN_version_h_INCLUDED
#define VERSION_STRING "uanytun version $VERSION"
+#define CRYPTO_LIB_NAME "$CRYPTO_LIB_NAME"
#endif
diff --git a/src/options.c b/src/options.c
index d564d39..db85771 100644
--- a/src/options.c
+++ b/src/options.c
@@ -485,11 +485,11 @@ void options_print_version()
{
printf("%s\n", VERSION_STRING);
#if defined(__clang__)
- printf("built using CLANG %s\n", __clang_version__);
+ printf("built using CLANG %s with %s crypto library.\n", __clang_version__, CRYPTO_LIB_NAME);
#elif defined(__GNUC__)
- printf("built using GCC %d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+ printf("built using GCC %d.%d.%d with %s crypto library\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__, CRYPTO_LIB_NAME);
#else
- printf("built using an unknown compiler\n");
+ printf("built using an unknown compiler with %s crypto library\n", CRYPTO_LIB_NAME, CRYPTO_LIB_NAME);
#endif
}