Imported Upstream version 0.3.4

[anytun.git] / src / authAlgo.h

diff --git a/src/authAlgo.h b/src/authAlgo.h
index c446853..663962f 100644 (file)
--- a/src/authAlgo.h
+++ b/src/authAlgo.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 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
@@ -28,9 +29,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifndef _AUTHALGO_H_
-#define _AUTHALGO_H_
+#ifndef ANYTUN_authAlgo_h_INCLUDED
+#define ANYTUN_authAlgo_h_INCLUDED
 
 #include "datatypes.h"
 #include "buffer.h"
@@ -76,7 +76,7 @@ public:
   void generate(KeyDerivation& kd, EncryptedPacket& packet);
   bool checkTag(KeyDerivation& kd, EncryptedPacket& packet);
 
-  static const u_int32_t DIGEST_LENGTH = 0;
+  static const uint32_t DIGEST_LENGTH = 0;
 };
 
 #ifndef NO_CRYPT
@@ -92,7 +92,7 @@ public:
   void generate(KeyDerivation& kd, EncryptedPacket& packet);
   bool checkTag(KeyDerivation& kd, EncryptedPacket& packet);
 
-  static const u_int32_t DIGEST_LENGTH = 20;
+  static const uint32_t DIGEST_LENGTH = 20;
 
 private:
 #ifndef USE_SSL_CRYPTO
@@ -100,7 +100,7 @@ private:
 #else
   HMAC_CTX ctx_;
 #endif
-  
+
   Buffer key_;
 };
 #endif