Merge pull request #103 from bluca/uninitialised_sockopt

Problem: curve keys getsockopt uninitialised read
zeromq · Feb 16, 2016 · 4d45ee9 · 4d45ee9
2 parents cb811a1 + eda5426
commit 4d45ee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ env:
 before_script:
 - mkdir tmp
 # libsodium
-- git clone git://github.com/jedisct1/libsodium.git
+- git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
 - ( cd libsodium; ./autogen.sh; ./configure --prefix=${BUILD_PREFIX}; make check; make install )
 
 # ZMQ stress tests need more open socket (files) than the usual default

diff --git a/src/options.cpp b/src/options.cpp
@@ -68,6 +68,9 @@ zmq::options_t::options_t () :
  conflate (false),
  handshake_ivl (30000)
 {
+ memset (curve_public_key, 0, CURVE_KEYSIZE);
+ memset (curve_secret_key, 0, CURVE_KEYSIZE);
+ memset (curve_server_key, 0, CURVE_KEYSIZE);
 }
 
 int zmq::options_t::setsockopt (int option_, const void *optval_,