X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2Fcryptinit.hpp;h=f8ac938d4b5eb6f77f148b0aac8ccc697c70b5bb;hp=c171c150e6a3145156b578f1290fd7d4a5f2a320;hb=ece844834d2cecc028ce81ca283f5d441088580e;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194 diff --git a/src/cryptinit.hpp b/src/cryptinit.hpp index c171c15..f8ac938 100644 --- a/src/cryptinit.hpp +++ b/src/cryptinit.hpp @@ -38,8 +38,6 @@ #include // boost thread callbacks for libgcrypt -#if defined(BOOST_HAS_PTHREADS) - static int boost_mutex_init(void **priv) { boost::mutex *lock = new boost::mutex(); @@ -71,10 +69,6 @@ static struct gcry_thread_cbs gcry_threads_boost = { GCRY_THREAD_OPTION_USER, NULL, boost_mutex_init, boost_mutex_destroy, boost_mutex_lock, boost_mutex_unlock }; -#else -#error this libgcrypt thread callbacks only work with pthreads -#endif - #define MIN_GCRYPT_VERSION "1.2.0" @@ -110,4 +104,17 @@ bool initLibGCrypt() #endif #endif +bool initCrypto() +{ +#ifndef NO_CRYPT +#ifndef USE_SSL_CRYPTO + return initLibGCrypt(); +#else + return true; +#endif +#else + return true; +#endif +} + #endif