3 files changed, 7 insertions, 4 deletions

diff --git a/toxcore/crypto_core.c b/toxcore/crypto_core.c
index a733c38e..3b379ca6 100644
--- a/toxcore/crypto_core.c
+++ b/toxcore/crypto_core.c
@@ -76,9 +76,9 @@ int public_key_valid(const uint8_t *public_key)
  * encrypt/decrypt operation.
  * enc_key has to be crypto_box_BEFORENMBYTES bytes long.
  */
-void encrypt_precompute(const uint8_t *public_key, const uint8_t *secret_key, uint8_t *enc_key)
+int encrypt_precompute(const uint8_t *public_key, const uint8_t *secret_key, uint8_t *enc_key)
 {
-    crypto_box_beforenm(enc_key, public_key, secret_key);
+    return crypto_box_beforenm(enc_key, public_key, secret_key);
 }
 
 int encrypt_data_symmetric(const uint8_t *secret_key, const uint8_t *nonce, const uint8_t *plain, uint32_t length,
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h
index ab509f09..1c9d7f94 100644
--- a/toxcore/crypto_core.h
+++ b/toxcore/crypto_core.h
@@ -87,7 +87,7 @@ int decrypt_data(const uint8_t *public_key, const uint8_t *secret_key, const uin
 /* Fast encrypt/decrypt operations. Use if this is not a one-time communication.
    encrypt_precompute does the shared-key generation once so it does not have
    to be preformed on every encrypt/decrypt. */
-void encrypt_precompute(const uint8_t *public_key, const uint8_t *secret_key, uint8_t *enc_key);
+int encrypt_precompute(const uint8_t *public_key, const uint8_t *secret_key, uint8_t *enc_key);
 
 /* Encrypts plain of length length to encrypted of length + 16 using a
  * secret key crypto_box_KEYBYTES big and a 24 byte nonce.
diff --git a/toxcore/network.c b/toxcore/network.c
index c6cf6ed4..244512c0 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -451,7 +451,10 @@ int networking_at_startup(void)
 #ifdef USE_RANDOMBYTES_STIR
     randombytes_stir();
 #else
-    sodium_init();
+
+    if (sodium_init() != 0)
+        return -1;
+
 #endif /*USE_RANDOMBYTES_STIR*/
 
 #endif/*VANILLA_NACL*/