Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into ncursesclient

4 files changed, 95 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23bfdcdb..552359c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,14 @@ set(core_sources
         core/Lossless_UDP.c
         core/net_crypto.c
         core/Messenger.c)
-
-set(test_sources
-        testing/nTox.c)
+if(WIN32)
+    set(test_sources
+            testing/Messenger_test.c)
+else()
+    set(test_sources
+            #testing/nTox.c)
+            testing/Messenger_test.c)
+endif()
 
 add_executable(${exe_name}
         ${core_sources}
diff --git a/core/network.c b/core/network.c
index 9693df1c..c08b3512 100644
--- a/core/network.c
+++ b/core/network.c
@@ -48,9 +48,11 @@ uint64_t current_time()
     
 }
 
+//return a random number
+//NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary
 uint32_t random_int()
 {
-    #ifdef WIN32
+    #ifndef VANILLA_NACL
     //NOTE: this function comes from libsodium
     return randombytes_random();
     #else
diff --git a/core/network.h b/core/network.h
index 4fa30905..33f11239 100644
--- a/core/network.h
+++ b/core/network.h
@@ -97,6 +97,7 @@ typedef struct
 uint64_t current_time();
 
 //return a random number
+//NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary
 uint32_t random_int();
 
 //Basic network functions:
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
new file mode 100644
index 00000000..7ecf1471
--- /dev/null
+++ b/docs/FAQ.txt
@@ -0,0 +1,83 @@
+TOX FAQ
+=======
+ 
+Contents
+========
+ 
+(1). What is Tox?
+(2). Where can I get Tox?
+(3). Tox
+(3.1) Which encryption algorithms does Tox employ?
+(3.2) Does Tox have plugin support?
+(3.3) I want to contribute to the Tox project.
+(3.3.1) I want to be a developer.
+(3.3.2) I want to contribute in UI design/sound.
+(3.3.3) Are there any other ways I can contribute?
+(4). Source
+(4.1) Where do I get the Tox source code?
+(4.2) How do I compile Tox?
+ 
+(5). Community
+(5.1) Where can I find the latest Tox thread?
+(5.2) Are there any other Tox threads/forums?
+===============================================================================
+ 
+(1). What is Tox?
+=================
+Tox is a free (as in freedom) peer to peer messaging application that aims to 
+replace skype.
+
+(2). Where can I get Tox?
+========================
+It's not done yet.
+
+(3). Tox
+=======
+(3.1). Which encryption algorithms does Tox employ?
+--------------------------------------------------
+Tox uses the encryption algorithms present in the NaCl crypto library.
+
+(3.2). Does Tox have plugin support?
+-----------------------------------
+Maybe.
+
+(3.3). I want to contribute to the Tox project.
+==============================================
+(3.3.1). I want to be a developer.
+---------------------------------
+Join the IRC.
+
+(3.3.2). I want to contribute in UI design/sound.
+------------------------------------------------
+Join the IRC.
+
+(3.3.3). Are there any other ways I can contribute?
+--------------------------------------------------
+Testing the application, reporting bugs and requesting features. Don't be 
+scared to criticize something if you think it is done wrong.
+
+(4). Source
+===========
+(4.1). Where do I get the Tox source code?
+-----------------------------------------
+The core library: https://github.com/irungentoo/ProjectTox-Core
+Some front ends:
+(None are in a usable state yet.)
+
+(4.2). How do I compile Tox?
+---------------------------
+You need to build and install libsodium.
+Then just cd in the repo and:
+mkdir build
+cd build
+cmake ..
+make
+
+(5). Community
+==============
+(5.1). Where can I find the latest Tox thread?
+---------------------------------------------
+
+
+(5.2). Are there any other Tox threads/forums?
+---------------------------------------------