diff options
author | Coren[m] <Break@Ocean> | 2013-09-13 19:44:14 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-13 19:44:14 +0200 |
commit | fa576e464e791199b4e9097bc835960f2dba5ea2 (patch) | |
tree | 205cd87b724b50406f2e44b9831dc834aded8b8c /toxcore/network.h | |
parent | e67a11dd04edce395c2d0ac403241ed08a875737 (diff) | |
parent | 339dcd60707ea7b46f5c450569d32f852a1c0be7 (diff) |
Merge remote-tracking branch 'upstream/master' into Integration
Diffstat (limited to 'toxcore/network.h')
-rw-r--r-- | toxcore/network.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/network.h b/toxcore/network.h index 6d9bbfc0..7dea8c16 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
@@ -62,6 +62,7 @@ typedef int sock_t; | |||
62 | #include <sodium.h> | 62 | #include <sodium.h> |
63 | #else | 63 | #else |
64 | #include <crypto_box.h> | 64 | #include <crypto_box.h> |
65 | #include <randombytes.h> | ||
65 | #define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES) | 66 | #define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES) |
66 | #endif | 67 | #endif |
67 | 68 | ||
@@ -229,7 +230,6 @@ typedef struct { | |||
229 | uint64_t current_time(void); | 230 | uint64_t current_time(void); |
230 | 231 | ||
231 | /* return a random number. | 232 | /* return a random number. |
232 | * NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary. | ||
233 | */ | 233 | */ |
234 | uint32_t random_int(void); | 234 | uint32_t random_int(void); |
235 | 235 | ||