summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README71
-rw-r--r--src/cipher.h2
-rw-r--r--src/keyDerivation.h2
3 files changed, 58 insertions, 17 deletions
diff --git a/README b/README
index 6e9b207..afa4c1f 100644
--- a/README
+++ b/README
@@ -1,36 +1,63 @@
Dependencies
============
+Anytun can be built by using either libgcrypt or the openssl-crypto library.
+The latter is more performant in most cases but there are some license
+issues when using this library.
+
Linux
-----
-build-essential
-libgcrypt11-dev
-libboost1.35-dev
-libboost-thread1.35-dev
-libboost-system1.35-dev
-libboost-regex1.35-dev
-asciidoc (only for manpage)
+using libgcrypt:
+ libgcrypt11-dev
+
+using ssl crypto lib:
+ libssl-dev
+
+common:
+ build-essential
+ libboost-serialization1.35-dev
+ libboost-thread1.35-dev
+ libboost-system1.35-dev
+ libboost-regex1.35-dev
+ asciidoc (only for manpage)
+
Windows
-------
OpenSSL
Developer:
http://www.slproweb.com/download/Win32OpenSSL-0_9_8j.exe
+
Runtime Only:
http://www.slproweb.com/download/Win32OpenSSL_Light-0_9_8j.exe
+
Boost 1.35:
http://www.boostpro.com/download/boost_1_35_0_setup.exe
+
+ As it can take some time to install everything from boost here is a
+ complete list of libraries which have to be installed in order to build anytun:
+
+ * Serialization
+ * Thread
+ * date_time
+ * System
+ * regex
+
Microsoft Visual C++ 2008 Redistributable Package (x86):
http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF
+
OpenBSD
-------
-libgcrypt
-libgpg-error
-boost
-gmake
+using libgcrypt:
+ libgcrypt
+ libgpg-error
+
+common:
+ boost
+ gmake
@@ -44,15 +71,29 @@ svn co http://anytun.org/svn/anytun/
Building from source
--------------------
-# cd src
-# ./configure
-# make
+using libgcrypt:
+
+ # cd src
+ # ./configure
+ # make
+
+using ssl crypto library:
+
+ # cd src
+ # ./configure --use-ssl-crypto
+ # make
+
Notes:
+ - try './configure --help' for further information
+ - if using openssl pre 0.9.8 you have to disable passphrase
+ because openssl had no SHA256 implementation prior to this
+ version
- on OpenBSD you have to use gmake instead of make
+
Errors:
--------
+=======
Note: Cannot open TUN/TAP dev /dev/net/tun: No such file or directory (errno=2)
Cannot open TUN/TAP dev /dev/anytun0: No such file or directory (errno=2)
diff --git a/src/cipher.h b/src/cipher.h
index 7ea8166..c358969 100644
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -120,7 +120,7 @@ private:
u_int16_t zero_;
} salt_;
struct ATTR_PACKED {
- u_int8_t fill_[SALT_LENGTH - sizeof(mux_t) - sizeof(sender_id_t) - 2 - sizeof(seq_nr_t)];
+ u_int8_t fill_[SALT_LENGTH - sizeof(mux_t) - sizeof(sender_id_t) - 2*sizeof(u_int8_t) - sizeof(seq_nr_t)];
mux_t mux_;
sender_id_t sender_id_;
u_int8_t empty_[2];
diff --git a/src/keyDerivation.h b/src/keyDerivation.h
index ef7998f..7242996 100644
--- a/src/keyDerivation.h
+++ b/src/keyDerivation.h
@@ -196,7 +196,7 @@ private:
u_int16_t zero_;
} params_;
struct ATTR_PACKED {
- u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - 2 - sizeof(seq_nr_t)];
+ u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - 2*sizeof(u_int8_t) - sizeof(seq_nr_t)];
u_int8_t label_;
u_int8_t r_fill_[2];
seq_nr_t r_;