generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Problem: can't be sure crypto_box always returns 0

Browse Source 
Libsodium has started returning -1 in some cases.

Solution: allow and handle error returns from these calls.

Fixes #1831
This commit is contained in:
Pieter Hintjens 2016-03-01 15:01:23 +01:00
parent 232094a09d
commit 5b7bf7509f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/curve_client.cpp
View File

@ -202,7 +202,6 @@ int zmq::curve_client_t::decode (msg_t *msg_)
}
cn_peer_nonce = nonce;
const size_t clen = crypto_box_BOXZEROBYTES + (msg_->size () - 16);
uint8_t *message_plaintext = static_cast <uint8_t *> (malloc (clen));
@ -270,7 +269,8 @@ int zmq::curve_client_t::produce_hello (msg_t *msg_)
int rc = crypto_box (hello_box, hello_plaintext,
sizeof hello_plaintext,
hello_nonce, server_key, cn_secret);
zmq_assert (rc == 0);
if (rc == -1)
return -1;
rc = msg_->init_size (200);
errno_assert (rc == 0);
@ -349,7 +349,8 @@ int zmq::curve_client_t::produce_initiate (msg_t *msg_)
int rc = crypto_box (vouch_box, vouch_plaintext,
sizeof vouch_plaintext,
vouch_nonce, cn_server, secret_key);
zmq_assert (rc == 0);
if (rc == -1)
return -1;
// Assume here that metadata is limited to 256 bytes
uint8_t initiate_nonce [crypto_box_NONCEBYTES];
@ -385,7 +386,8 @@ int zmq::curve_client_t::produce_initiate (msg_t *msg_)
rc = crypto_box (initiate_box, initiate_plaintext,
mlen, initiate_nonce, cn_server, cn_secret);
zmq_assert (rc == 0);
if (rc == -1)
return -1;
rc = msg_->init_size (113 + mlen - crypto_box_BOXZEROBYTES);
errno_assert (rc == 0);

3
src/curve_server.cpp
View File

@ -382,7 +382,8 @@ int zmq::curve_server_t::produce_welcome (msg_t *msg_)
rc = crypto_box (welcome_ciphertext, welcome_plaintext,
sizeof welcome_plaintext,
welcome_nonce, cn_client, secret_key);
zmq_assert (rc == 0);
if (rc == -1)
return -1;
rc = msg_->init_size (168);
errno_assert (rc == 0);

2
tests/test_security_curve.cpp
View File

@ -155,7 +155,7 @@ int main (void)
// Check CURVE security with a garbage server key
// This will be caught by the curve_server class, not passed to ZAP
char garbage_key [] = "0000111122223333444455556666777788889999";
char garbage_key [] = "0000000000000000000000000000000000000000";
client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, garbage_key, 41);