Merge pull request #2372 from Q-Leap-Networks/pr-fix_test_sodium

zmq_curve_keypair(): return result from crypto_box_keypair()
This commit is contained in:
Luca Boccassi 2017-03-16 14:48:15 +00:00 committed by GitHub
commit db854614e1
2 changed files with 2 additions and 4 deletions

View File

@ -217,12 +217,11 @@ int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key)
uint8_t public_key [32];
uint8_t secret_key [32];
// Return codes are suppressed as none of these can actually fail.
crypto_box_keypair (public_key, secret_key);
int res = crypto_box_keypair (public_key, secret_key);
zmq_z85_encode (z85_public_key, public_key, 32);
zmq_z85_encode (z85_secret_key, secret_key, 32);
return 0;
return res;
#else
(void) z85_public_key, (void) z85_secret_key;
errno = ENOTSUP;

View File

@ -40,7 +40,6 @@ void test__zmq_curve_keypair__always__success (void)
#if defined (ZMQ_HAVE_CURVE)
assert (rc == 0);
assert (zmq_errno () == 0);
#else
assert (rc == -1);
assert (zmq_errno () == ENOTSUP);