Imported Upstream version 0.3.5

[anytun.git] / src / anytunError.h

diff --git a/src/anytunError.h b/src/anytunError.h
index 26b4012..e31fa0e 100644 (file)
--- a/src/anytunError.h
+++ b/src/anytunError.h
@@ -6,19 +6,20 @@
  *  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-2008 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.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,11 +27,24 @@
  *  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_ERROR_H
-#define _ANYTUN_ERROR_H
+#ifndef ANYTUN_anytunError_h_INCLUDED
+#define ANYTUN_anytunError_h_INCLUDED
 
 #include <sstream>
 #include <boost/system/system_error.hpp>
@@ -39,7 +53,8 @@
 #define STERROR_TEXT_MAX 200
 
 #ifndef NO_CRYPT
-#ifndef USE_SSL_CRYPTO
+
+#if defined(USE_GCRYPT)
 #include <gcrypt.h>
 
 class AnytunGpgError
@@ -50,6 +65,7 @@ public:
 };
 std::ostream& operator<<(std::ostream& stream, AnytunGpgError const& value);
 #endif
+
 #endif
 
 class AnytunErrno
@@ -60,7 +76,7 @@ public:
 };
 std::ostream& operator<<(std::ostream& stream, AnytunErrno const& value);
 
-class ErrorStringBuilder 
+class ErrorStringBuilder
 {
 public:
   ErrorStringBuilder(ErrorStringBuilder const& src) { stream << src.stream.str(); };