generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-07-05 18:01:41 +02:00
Code Issues Projects Releases Wiki Activity

Problem: No error-checking of setsockopt ZMQ_CURVE_* z85 keys. Solves #1094.

Browse Source
This commit is contained in:
Constantin Rack 2014-11-07 16:56:49 +01:00
parent 6d9f97ad60
commit 1844fc3284
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/options.cpp
View File

@ -376,20 +376,22 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
} }
else else
if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) { if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) {
zmq_z85_decode (curve_public_key, (char *) optval_); if (zmq_z85_decode (curve_public_key, (char *) optval_)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
return 0; return 0;
} }
}
else else
// Deprecated, not symmetrical with zmq_getsockopt // Deprecated, not symmetrical with zmq_getsockopt
if (optvallen_ == CURVE_KEYSIZE_Z85) { if (optvallen_ == CURVE_KEYSIZE_Z85) {
char z85_key [41]; char z85_key [CURVE_KEYSIZE_Z85 + 1];
memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85); memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85);
z85_key [CURVE_KEYSIZE_Z85] = 0; z85_key [CURVE_KEYSIZE_Z85] = 0;
zmq_z85_decode (curve_public_key, z85_key); if (zmq_z85_decode (curve_public_key, z85_key)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
return 0; return 0;
} }
}
break; break;
case ZMQ_CURVE_SECRETKEY: case ZMQ_CURVE_SECRETKEY:
@ -400,20 +402,22 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
} }
else else
if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) { if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) {
zmq_z85_decode (curve_secret_key, (char *) optval_); if (zmq_z85_decode (curve_secret_key, (char *) optval_)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
return 0; return 0;
} }
}
else else
// Deprecated, not symmetrical with zmq_getsockopt // Deprecated, not symmetrical with zmq_getsockopt
if (optvallen_ == CURVE_KEYSIZE_Z85) { if (optvallen_ == CURVE_KEYSIZE_Z85) {
char z85_key [41]; char z85_key [CURVE_KEYSIZE_Z85 + 1];
memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85); memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85);
z85_key [CURVE_KEYSIZE_Z85] = 0; z85_key [CURVE_KEYSIZE_Z85] = 0;
zmq_z85_decode (curve_secret_key, z85_key); if (zmq_z85_decode (curve_secret_key, z85_key)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
return 0; return 0;
} }
}
break; break;
case ZMQ_CURVE_SERVERKEY: case ZMQ_CURVE_SERVERKEY:
@ -425,22 +429,24 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
} }
else else
if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) { if (optvallen_ == CURVE_KEYSIZE_Z85 + 1) {
zmq_z85_decode (curve_server_key, (char *) optval_); if (zmq_z85_decode (curve_server_key, (char *) optval_)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
as_server = 0; as_server = 0;
return 0; return 0;
} }
}
else else
// Deprecated, not symmetrical with zmq_getsockopt // Deprecated, not symmetrical with zmq_getsockopt
if (optvallen_ == CURVE_KEYSIZE_Z85) { if (optvallen_ == CURVE_KEYSIZE_Z85) {
char z85_key [41]; char z85_key [CURVE_KEYSIZE_Z85 + 1];
memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85); memcpy (z85_key, (char *) optval_, CURVE_KEYSIZE_Z85);
z85_key [CURVE_KEYSIZE_Z85] = 0; z85_key [CURVE_KEYSIZE_Z85] = 0;
zmq_z85_decode (curve_server_key, z85_key); if (zmq_z85_decode (curve_server_key, z85_key)) {
mechanism = ZMQ_CURVE; mechanism = ZMQ_CURVE;
as_server = 0; as_server = 0;
return 0; return 0;
} }
}
break; break;
# endif # endif