diff options
author | charmlesscoin <charmlesscoin@gmail.com> | 2013-08-05 16:11:37 -0400 |
---|---|---|
committer | charmlesscoin <charmlesscoin@gmail.com> | 2013-08-05 16:11:37 -0400 |
commit | d92550506604fcff8164a6dce221f0e4be6adda6 (patch) | |
tree | f386f8a7ad2320af058f8554f2e40b1319bbfd50 /core/net_crypto.h | |
parent | 1b6c16f7ff57624bee1594f31b057609d52dbea6 (diff) | |
parent | f0397ebb2b85100e2ac1b2d3a377ba012ab53240 (diff) |
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core
Diffstat (limited to 'core/net_crypto.h')
-rw-r--r-- | core/net_crypto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/net_crypto.h b/core/net_crypto.h index 0e7284c9..66634d45 100644 --- a/core/net_crypto.h +++ b/core/net_crypto.h | |||
@@ -110,7 +110,7 @@ int is_cryptoconnected(int crypt_connection_id); | |||
110 | 110 | ||
111 | /* Generate our public and private keys | 111 | /* Generate our public and private keys |
112 | Only call this function the first time the program starts. */ | 112 | Only call this function the first time the program starts. */ |
113 | void new_keys(); | 113 | void new_keys(void); |
114 | 114 | ||
115 | /* save the public and private keys to the keys array | 115 | /* save the public and private keys to the keys array |
116 | Length must be crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES */ | 116 | Length must be crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES */ |
@@ -122,10 +122,10 @@ void load_keys(uint8_t * keys); | |||
122 | 122 | ||
123 | /* run this to (re)initialize net_crypto | 123 | /* run this to (re)initialize net_crypto |
124 | sets all the global connection variables to their default values. */ | 124 | sets all the global connection variables to their default values. */ |
125 | void initNetCrypto(); | 125 | void initNetCrypto(void); |
126 | 126 | ||
127 | /* main loop */ | 127 | /* main loop */ |
128 | void doNetCrypto(); | 128 | void doNetCrypto(void); |
129 | 129 | ||
130 | #ifdef __cplusplus | 130 | #ifdef __cplusplus |
131 | } | 131 | } |