X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fcryptinit.hpp;h=17bb82597683902a44cbc908390885085faa28fa;hb=455cf8256fa995c63374721cbf9bcd93eaa2f618;hp=f8ac938d4b5eb6f77f148b0aac8ccc697c70b5bb;hpb=ece844834d2cecc028ce81ca283f5d441088580e;p=anytun.git

diff --git a/src/cryptinit.hpp b/src/cryptinit.hpp
index f8ac938..17bb825 100644
--- a/src/cryptinit.hpp
+++ b/src/cryptinit.hpp
@@ -6,12 +6,12 @@
  *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
  *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
  *  ethernet, ip, arp ...). satp directly includes cryptography and
- *  message authentication based on the methodes used by SRTP.  It is
+ *  message authentication based on the methods used by SRTP.  It is
  *  intended to deliver a generic, scaleable and secure solution for
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,73 +27,71 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
  */
 
 #ifndef ANYTUN_cryptinit_hpp_INCLUDED
 #define ANYTUN_cryptinit_hpp_INCLUDED
 
 #ifndef NO_CRYPT
-#ifndef USE_SSL_CRYPTO
-#include <gcrypt.h>
-
-// boost thread callbacks for libgcrypt
-static int boost_mutex_init(void **priv)
-{
-  boost::mutex *lock = new boost::mutex();
-  if (!lock)
-    return ENOMEM;
-  *priv = lock;
-  return 0;
-}
 
-static int boost_mutex_destroy(void **lock)
-{
-  delete reinterpret_cast<boost::mutex*>(*lock);
-  return 0;
-}
-
-static int boost_mutex_lock(void **lock)
-{
-  reinterpret_cast<boost::mutex*>(*lock)->lock();
-  return 0;
-}
+#include "anytunError.h"
 
-static int boost_mutex_unlock(void **lock)
-{
-  reinterpret_cast<boost::mutex*>(*lock)->unlock();
-  return 0;
-}
+#if defined(USE_GCRYPT)
+#include <gcrypt.h>
 
-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 };
+#if GCRYPT_VERSION_NUMBER < 0x010600
+#if defined(BOOST_HAS_PTHREADS)
+// boost thread callbacks for libgcrypt
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#else
+#error You can not use gcrypt without pthreads - please configure Boost to use pthreads!
+#endif // defined(BOOST_HAS_PTHREADS)
+#endif // GCRYPT_VERSION_NUMBER < 0x010600
 
 #define MIN_GCRYPT_VERSION "1.2.0"
 
 bool initLibGCrypt()
 {
-  // make libgcrypt thread safe 
+#if GCRYPT_VERSION_NUMBER < 0x010600
+#if defined(BOOST_HAS_PTHREADS)
+  // make libgcrypt thread safe
   // this must be called before any other libgcrypt call
-  gcry_control( GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost );
+  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#else
+#error You can not use gcrypt without pthreads - please configure Boost to use pthreads!
+#endif // defined(BOOST_HAS_PTHREADS)
+#endif // GCRYPT_VERSION_NUMBER < 0x010600
 
   // this must be called right after the GCRYCTL_SET_THREAD_CBS command
   // no other function must be called till now
-  if( !gcry_check_version( MIN_GCRYPT_VERSION ) ) {
+  if(!gcry_check_version(MIN_GCRYPT_VERSION)) {
     std::cout << "initLibGCrypt: Invalid Version of libgcrypt, should be >= " << MIN_GCRYPT_VERSION << std::endl;
     return false;
   }
 
-  gcry_error_t err = gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  if( err ) {
+  gcry_error_t err = gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+  if(err) {
     std::cout << "initLibGCrypt: Failed to disable secure memory: " << AnytunGpgError(err) << std::endl;
     return false;
   }
 
   // Tell Libgcrypt that initialization has completed.
   err = gcry_control(GCRYCTL_INITIALIZATION_FINISHED);
-  if( err ) {
+  if(err) {
     std::cout << "initLibGCrypt: Failed to finish initialization: " << AnytunGpgError(err) << std::endl;
     return false;
   }
@@ -102,16 +100,21 @@ bool initLibGCrypt()
   return true;
 }
 #endif
+
 #endif
 
 bool initCrypto()
 {
 #ifndef NO_CRYPT
-#ifndef USE_SSL_CRYPTO
-  return initLibGCrypt();
-#else
+
+#if defined(USE_SSL_CRYPTO)
   return true;
+#elif defined(USE_NETTLE)
+  return true;
+#else  // USE_GCRYPT is the default
+  return initLibGCrypt();
 #endif
+
 #else
   return true;
 #endif