diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-06-21 19:21:33 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-06-22 03:58:55 +0200 |
commit | 30ba40798ca12abbef37e98f30b5ba1e25796e67 (patch) | |
tree | a81bee43ca2a36d7c203e4cbc1fb318923b73436 /pkgs | |
parent | d51ec20a50a3dbce2ef129e3fa65c46a171c3591 (diff) |
zeromq: remove unused sodium_warning.patch
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/zeromq/sodium_warning.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/pkgs/development/libraries/zeromq/sodium_warning.patch b/pkgs/development/libraries/zeromq/sodium_warning.patch deleted file mode 100644 index 4b84fd7edf42d..0000000000000 --- a/pkgs/development/libraries/zeromq/sodium_warning.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001 -From: Constantin Rack <constantin@rack.li> -Date: Sat, 8 Nov 2014 10:50:17 +0100 -Subject: [PATCH] Problem: return code of sodium_init() is not checked. - -There are two todo comments in curve_client.cpp and curve_server.cpp that suggest -checking the return code of sodium_init() call. sodium_init() returns -1 on error, -0 on success and 1 if it has been called before and is already initalized: -https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c ---- - src/curve_client.cpp | 7 ++++--- - src/curve_server.cpp | 7 ++++--- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/curve_client.cpp b/src/curve_client.cpp -index 6019c54..77fc420 100644 ---- a/src/curve_client.cpp -+++ b/src/curve_client.cpp -@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - cn_peer_nonce(1), - sync() - { -+ int rc; - memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES); - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES); -@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - -diff --git a/src/curve_server.cpp b/src/curve_server.cpp -index a3c4243..22c32d6 100644 ---- a/src/curve_server.cpp -+++ b/src/curve_server.cpp -@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - cn_peer_nonce(1), - sync() - { -+ int rc; - // Fetch our secret key from socket options - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - scoped_lock_t lock (sync); -@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - |