0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00

2748 Commits

Author SHA1 Message Date
Laurent Alebarde
1206f4572b oblige the application to explicitely set the node type for PLAIN 2013-09-17 12:47:21 +02:00
Laurent Alebarde
bfd472f97c makes curve keys symetric as in libcurve + factorisation 2013-09-17 12:44:14 +02:00
Martin Hurton
ad0b325e4a Merge pull request #665 from hintjens/master
Added test case for NULL domains
2013-09-17 01:53:59 -07:00
Pieter Hintjens
7bb2b6ae11 Fixed length of domain setting 2013-09-17 10:04:57 +02:00
Pieter Hintjens
7735ca5f8d Added test case for NULL domains 2013-09-17 09:48:32 +02:00
Ian Barber
67013f19f6 Merge pull request #664 from hintjens/master
NULL mechanism was not dealing with ZAP denials properly
2013-09-16 06:20:21 -07:00
Pieter Hintjens
321a8ffea9 NULL mechanism was not dealing with ZAP denials properly 2013-09-16 15:09:55 +02:00
Ian Barber
971b275f7a Merge pull request #663 from hintjens/master
Fixed random failures in test_security_plain and _curve
2013-09-16 02:04:44 -07:00
Pieter Hintjens
fe9815a789 Fixed random failures in test_security_plain and _curve
* ZAP handler thread was not getting time to start up
* Code now creates and binds handler socket in parent thread and
  passes the socket to the zap_handler, so this always gets the
  authentication requests.
2013-09-16 10:56:49 +02:00
Pieter Hintjens
276cd1f1da Merge pull request #662 from ricnewton/master
Fix windows build
2013-09-16 01:32:55 -07:00
Richard Newton
6f351007d4 Fix windows build 2013-09-16 09:23:47 +01:00
Pieter Hintjens
fbe1b79188 Merge pull request #661 from lalebarde/master
simplify test_security_curve.cpp with zmq_z85_encode
2013-09-15 15:36:00 -07:00
Laurent Alebarde
dc1f5e9f7c simplify test_security_curve.cpp with zmq_z85_encode 2013-09-16 00:06:24 +02:00
Ian Barber
d76f3f7c03 Merge pull request #660 from hintjens/master
Added z85 codec to ZMQ API
2013-09-15 11:37:16 -07:00
Pieter Hintjens
576e3ca5e0 Added z85 codec to ZMQ API
* Removed redundant Z85 code and include files from project
* Simplified use of headers in test cases (now they all just use testutil.hpp)
* Export zmq_z85_encode() and zmq_z85_decode() in API
* Added man pages for these two functions
2013-09-15 20:13:44 +02:00
Ian Barber
5c7b39275f Merge pull request #659 from hintjens/master
Fixed Z85 methods to be static
2013-09-15 09:51:09 -07:00
Pieter Hintjens
193d0bb634 Fixed Z85 methods to be static and not pollute library 2013-09-15 17:30:18 +02:00
Pieter Hintjens
65ef76bb59 Minor simplification to makefile 2013-09-15 15:45:40 +02:00
Pieter Hintjens
90668517da Merge pull request #658 from ricnewton/inproc_connect_before_bind
Support high water mark on inproc socket connect before bind.
2013-09-15 06:19:00 -07:00
Richard Newton
4e6c56e081 Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind 2013-09-15 13:36:07 +01:00
Richard Newton
b9298823b4 Set hwm on connect socket before bind has happend to just that of connects hwm. 2013-09-15 13:35:44 +01:00
Richard Newton
7841b0dd0f Support high water mark on inproc socket connect before bind. 2013-09-14 17:27:18 +01:00
Richard Newton
133c32d5ed Merge pull request #657 from hintjens/master
Build didn't work if libsodium wasn't installed
2013-09-13 00:52:12 -07:00
Pieter Hintjens
0db2bbe29d Build didn't work if libsodium wasn't installed 2013-09-13 09:47:23 +02:00
Pieter Hintjens
3298e5a206 Merge pull request #656 from ricnewton/inproc_connect_before_bind
Allow inproc sockets to connect before bind
2013-09-12 13:46:37 -07:00
Richard Newton
b9c09064d5 Fix whitespace 2013-09-12 21:22:47 +01:00
Richard Newton
d5bd68b60b Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind 2013-09-12 21:09:30 +01:00
Richard Newton
379bcb0881 Send identities when connecting pending sockets. 2013-09-12 21:07:29 +01:00
Ian Barber
c1fabf5ca9 Merge pull request #655 from hintjens/master
Fixed overwrite in zmq_getsockopt
2013-09-12 10:27:57 -07:00
Richard Newton
7c3496a76a Fix race condition and support multiple socket connects before bind. 2013-09-12 18:09:37 +01:00
Pieter Hintjens
60f470450d Merge pull request #654 from lalebarde/master
add exhaustive comparison in testutil bounce
2013-09-12 09:53:26 -07:00
Laurent Alebarde
6c84a54388 add exhaustive comparison in testutil bounce 2013-09-12 18:17:31 +02:00
Pieter Hintjens
345bf146f1 Fixed overwrite in zmq_getsockopt
On ZMQ_CURVE_xxxKEY fetches, would return 41 bytes into caller's 40-byte
buffer. Now these fetches only return 41 bytes if the caller explicitly
provides a 41-byte buffer (i.e. the option size is 41).
2013-09-12 18:03:23 +02:00
Richard Newton
6fefa4166a Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind 2013-09-12 15:13:25 +01:00
Richard Newton
5f20d63665 First attempt at inproc connect before bind 2013-09-12 14:44:44 +01:00
Martin Hurton
168efb9739 Merge pull request #653 from mattconnolly/master
Fix preprocessor typoe
2013-09-12 05:21:25 -07:00
Pieter Hintjens
6ff65a8aa4 Builds and installs curve_keygen tool 2013-09-12 13:16:22 +02:00
Richard Newton
0d14efe73a Merge pull request #652 from hintjens/master
Minor fixes to project packaging
2013-09-12 03:56:27 -07:00
Pieter Hintjens
ac8c72cea6 Added test_ctx_destroy to .gitignore 2013-09-12 12:47:14 +02:00
Pieter Hintjens
d1ba8a50d2 Extended TravisCI build to use libsodium 2013-09-12 12:46:43 +02:00
Pieter Hintjens
52370bff44 Removed debugging printfs 2013-09-12 12:46:23 +02:00
Matt Connolly
0f9e5f6049 Fix preprocessor typoe 2013-09-12 20:30:16 +10:00
Pieter Hintjens
0f7141c21a Merge pull request #651 from ricnewton/master
Fix Makefile.am for test_ctx_destroy
2013-09-11 09:33:08 -07:00
Richard Newton
8e6b5ad17e Fix Makefile.am for test_ctx_destroy 2013-09-11 15:02:16 +01:00
Pieter Hintjens
bba0dd19a1 Merge pull request #650 from ricnewton/master
Implement non-blocking shutdown command
2013-09-10 07:03:40 -07:00
Richard Newton
ccf0e61b77 Merge remote-tracking branch 'upstream/master' 2013-09-10 13:30:11 +01:00
Richard Newton
64e1c181f7 Implement non-blocking shutdown command that unblocks other threads waiting on blocking operations. 2013-09-10 13:30:00 +01:00
Martin Hurton
25c89cace1 Merge pull request #649 from hintjens/master
Fixed minor error in NULL mechanism (spec was wrong)
2013-09-09 12:12:36 -07:00
Pieter Hintjens
6725c4644f Added ZMQ_ZAP_DOMAIN socket option
* This is passed to the ZAP handler in the 'domain' field

* If not set, or empty, then NULL security does not call the ZAP handler

* This resolves the phantom ZAP request syndrome seen with sockets where
  security was never intended (e.g. in test cases)

* This means if you install a ZAP handler, it will not get any requests
  for new connections until you take some explicit action, which can be
  setting a username/password for PLAIN, a key for CURVE, or the domain
  for NULL.
2013-09-09 20:40:34 +02:00
Pieter Hintjens
c45d91a106 Fixed comments on curve_keygen tool 2013-09-09 19:58:31 +02:00