projects
/
anytun.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.3.3
[anytun.git]
/
src
/
cryptinit.hpp
diff --git
a/src/cryptinit.hpp
b/src/cryptinit.hpp
index
c171c15
..
f8ac938
100644
(file)
--- a/
src/cryptinit.hpp
+++ b/
src/cryptinit.hpp
@@
-38,8
+38,6
@@
#include <gcrypt.h>
// boost thread callbacks for libgcrypt
#include <gcrypt.h>
// boost thread callbacks for libgcrypt
-#if defined(BOOST_HAS_PTHREADS)
-
static int boost_mutex_init(void **priv)
{
boost::mutex *lock = new boost::mutex();
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 };
{ 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"
#define MIN_GCRYPT_VERSION "1.2.0"
@@
-110,4
+104,17
@@
bool initLibGCrypt()
#endif
#endif
#endif
#endif
+bool initCrypto()
+{
+#ifndef NO_CRYPT
+#ifndef USE_SSL_CRYPTO
+ return initLibGCrypt();
+#else
+ return true;
+#endif
+#else
+ return true;
+#endif
+}
+
#endif
#endif