diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | core/network.c | 4 | ||||
-rw-r--r-- | core/network.h | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 23bfdcdb..5eb00b90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -9,9 +9,13 @@ set(core_sources | |||
9 | core/Lossless_UDP.c | 9 | core/Lossless_UDP.c |
10 | core/net_crypto.c | 10 | core/net_crypto.c |
11 | core/Messenger.c) | 11 | core/Messenger.c) |
12 | 12 | if(WIN32) | |
13 | set(test_sources | 13 | set(test_sources |
14 | testing/nTox.c) | 14 | testing/Messenger_test.c) |
15 | else() | ||
16 | set(test_sources | ||
17 | testing/nTox.c) | ||
18 | endif() | ||
15 | 19 | ||
16 | add_executable(${exe_name} | 20 | add_executable(${exe_name} |
17 | ${core_sources} | 21 | ${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() | |||
48 | 48 | ||
49 | } | 49 | } |
50 | 50 | ||
51 | //return a random number | ||
52 | //NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary | ||
51 | uint32_t random_int() | 53 | uint32_t random_int() |
52 | { | 54 | { |
53 | #ifdef WIN32 | 55 | #ifndef VANILLA_NACL |
54 | //NOTE: this function comes from libsodium | 56 | //NOTE: this function comes from libsodium |
55 | return randombytes_random(); | 57 | return randombytes_random(); |
56 | #else | 58 | #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 | |||
97 | uint64_t current_time(); | 97 | uint64_t current_time(); |
98 | 98 | ||
99 | //return a random number | 99 | //return a random number |
100 | //NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary | ||
100 | uint32_t random_int(); | 101 | uint32_t random_int(); |
101 | 102 | ||
102 | //Basic network functions: | 103 | //Basic network functions: |