0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 02:07:59 +08:00

2665 Commits

Author SHA1 Message Date
Pieter Hintjens
ead6826cc1 Merge pull request #691 from minrk/curve_keygen
Expose zmq_curve_keypair via zmq_utils
2013-09-29 13:19:26 -07:00
MinRK
4577956964 return NULL and set EINVAL on bad z85 input
asserts aren't appropriate for checking user input.
2013-09-29 13:07:51 -07:00
MinRK
87254abc9f use zmq_curve_keypair in curve_keygen 2013-09-29 13:05:27 -07:00
MinRK
d1a927a92e add zmq_curve_keypair to zmq_utils 2013-09-29 13:02:39 -07:00
Pieter Hintjens
30d34888e0 Merge pull request #690 from mattconnolly/master
config for libsodium in alternate path, using CPP flags for both C and C...
2013-09-29 04:22:24 -07:00
Matt Connolly
7660b78e12 config for libsodium in alternate path, using CPP flags for both C and C++ sources. 2013-09-29 21:20:14 +10:00
Pieter Hintjens
6c25d2f880 Merge pull request #689 from minrk/curve_keygen
include missing platform.hpp in curve_keygen
2013-09-29 02:29:53 -07:00
MinRK
cf4bfd48cf include missing platform.hpp in curve_keygen
it was excluded, so HAVE_SODIUM would never be defined,
leading to curve_keygen always reporting "recompile with libsodium"
2013-09-28 15:42:52 -07:00
MinRK
3d7b2b4c04 declare z85_encode / decode in zmq_utils
they are used by curve_keygen, but not available
2013-09-28 15:42:00 -07:00
Pieter Hintjens
f1002e9492 Merge pull request #688 from mattconnolly/master
This pull requests fixes building on SmartOS and possibly other Solaris-like systems
2013-09-27 04:30:24 -07:00
Matt Connolly
848ce1adb1 Disable compiler warning for Solaris 2013-09-27 11:20:09 +00:00
Matt Connolly
aa84e85153 Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup. 2013-09-27 11:12:16 +00:00
Richard Newton
2af23cf40c Merge pull request #687 from hintjens/master
Updated CMake project for test_issue_566
2013-09-26 05:39:17 -07:00
Pieter Hintjens
015b43f969 Updated CMake project for test_issue_566 2013-09-26 14:32:47 +02:00
Martin Hurton
d568e7f587 Merge pull request #686 from hintjens/master
Added test case for issue 566
2013-09-26 05:30:59 -07:00
Pieter Hintjens
e42a0a4074 Added test case for issue 566
* Tests dealer-to-router connection 100 times
* This was failing in ZMQ v4.0.0 RC1
2013-09-26 14:18:40 +02:00
Richard Newton
5271bc9db3 Merge pull request #685 from hintjens/master
Build/test errors on OS/X with clang++
2013-09-26 02:45:14 -07:00
Pieter Hintjens
26d5ac4075 curve_keygen needed assert.h 2013-09-26 11:35:52 +02:00
Pieter Hintjens
9d51155ce2 Build/test errors on OS/X with clang++ 2013-09-26 11:33:44 +02:00
Pieter Hintjens
9827a1278b Merge pull request #684 from hurtonm/master
Call flush after writing the identity message
2013-09-26 01:01:47 -07:00
Martin Hurton
be25cfdf35 Call flush after writing the identity message 2013-09-26 09:40:23 +02:00
Richard Newton
b0b2567fcf Merge pull request #683 from hintjens/master
Updated libzmq CURVE to track RFC 27
2013-09-24 08:11:17 -07:00
Pieter Hintjens
82149dde19 Updated libzmq CURVE to track RFC 27
* The INITIATE command vouch box is Box[C',S](C->S') instead of Box[C'](C->S),
  as recommended by https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/,
  to reduce the risk of client impersonation.

* Mirrors the change in libcurve and CurveZMQ specifications.
2013-09-24 15:31:10 +02:00
Pieter Hintjens
cc2823e240 Merge pull request #682 from hintjens/master
Fixed build for MSVC 2008
2013-09-24 03:48:09 -07:00
Pieter Hintjens
51fe8cfe52 Merge pull request #681 from ipechorin/master
stdint.h is not available on all platforms
2013-09-24 03:32:34 -07:00
Pieter Hintjens
b3346fb37a Fixed build for MSVC 2008 2013-09-24 12:29:21 +02:00
Ivan Pechorin
b504aad160 stdint.h is not available on all platforms 2013-09-24 14:10:31 +04:00
Richard Newton
5f0a8dcffe Merge pull request #680 from hintjens/master
Bumped library version and age
2013-09-24 00:24:45 -07:00
Pieter Hintjens
186b713aba Bumped library version and age 2013-09-24 09:10:39 +02:00
Pieter Hintjens
920385c40f Merge pull request #679 from mattconnolly/master
Update configure: Allow libsodium to be installed in a custom path
2013-09-23 23:00:33 -07:00
Matt Connolly
12eef06e45 Update configure: Allow libsodium to be installed in a custom path 2013-09-24 08:07:43 +10:00
Matt Connolly
7b5da7dc09 git ignore test run output files: tests/test*.{log|trs} 2013-09-24 08:07:10 +10:00
Richard Newton
0e7124b656 Merge pull request #678 from hintjens/master
Move away from port 8080 which is occupied on some boxes
2013-09-20 14:27:11 -07:00
Pieter Hintjens
f36a49de6d Move away from port 8080 which is occupied on some boxes 2013-09-20 23:16:29 +02:00
Richard Newton
59f1fbc9a2 Merge pull request #677 from vortechs2000/fix_aix
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
2013-09-20 12:45:00 -07:00
AJ Lewis
e3e7efedbe Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
This reverts commit 015d9564ee16959847a30a0ec3b080f718f40678.
2013-09-20 14:38:11 -05:00
Richard Newton
aa2aab1785 Merge pull request #674 from hintjens/master
Fixed packaging (makefiles were wrong)
2013-09-20 12:13:11 -07:00
Pieter Hintjens
1293f1b956 Merge pull request #675 from vortechs2000/fix_aix
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
2013-09-20 09:54:00 -07:00
AJ Lewis
015d9564ee Reference platform.h by ../src/platform.h - AIX is ignoring -I flags 2013-09-20 11:48:18 -05:00
Pieter Hintjens
b49aa7a65d Updated NEWS for 4.0.0 release 2013-09-20 17:28:19 +02:00
Pieter Hintjens
0d3f9eb592 Missing file from Makefile.am 2013-09-20 16:40:40 +02:00
Pieter Hintjens
21157f7d85 Next version off libzmq master is 4.1.0 2013-09-20 15:59:16 +02:00
Pieter Hintjens
84a013e3de Fixed packaging for source distribution 2013-09-20 15:58:55 +02:00
Richard Newton
1a9ea3e24a Merge pull request #673 from hintjens/master
Renamed new socket options to be clearer
2013-09-20 06:41:30 -07:00
Pieter Hintjens
5e609be345 Renamed new socket options to be clearer
* ZMQ_REQ_STRICT was negative option (default 1) which goes against
  the standard, where defaults are zero. I renamed this to
  ZMQ_REQ_RELAXED.

* ZMQ_REQ_REQUEST_IDS felt clumsy and describes the technical solution
  rather than the problem/requirement. I changed to ZMQ_REQ_CORRELATE
  which seems more explicit.
2013-09-20 15:30:04 +02:00
Richard Newton
aaf2a2cdfb Merge pull request #672 from hintjens/master
Renamed test_connect_delay to test_immediate to match name of option
2013-09-20 06:24:47 -07:00
Pieter Hintjens
0997a8b753 Removed inaccurate note in zmq_poll man page 2013-09-20 14:39:35 +02:00
Pieter Hintjens
71c9ae8b18 Built zmq_send_const man page properly 2013-09-20 14:28:06 +02:00
Pieter Hintjens
92c01f69db Renamed test_connect_delay to test_immediate
* The ZMQ_CONNECT_DELAY option was renamed to ZMQ_IMMEDIATE
2013-09-20 14:23:43 +02:00
Pieter Hintjens
0644256ef4 Updated NEWS for 3.2.x releases 2013-09-20 13:28:16 +02:00
Pieter Hintjens
8f0a757f08 Merge pull request #671 from ricnewton/master
Testing github jenkins integration
2013-09-19 06:09:13 -07:00
Richard Newton
78cabfe8ea More testing github jenkins integration 2013-09-19 12:58:58 +01:00
Richard Newton
d503e19381 Merge branch 'master' of https://github.com/zeromq/libzmq 2013-09-19 12:37:54 +01:00
Richard Newton
544575d18c Revert "More testing github jenkins integratio"
This reverts commit 0640d6d2baa014ad93ba57ad2f692af8f9081eb0.
2013-09-19 12:28:21 +01:00
Richard Newton
0640d6d2ba More testing github jenkins integratio 2013-09-19 12:11:50 +01:00
Richard Newton
575ff39bfe Testing github jenkins integration 2013-09-19 12:02:17 +01:00
Pieter Hintjens
90867a4e8f Merge pull request #670 from ricnewton/master
Fix cmake build
2013-09-19 02:42:31 -07:00
Richard Newton
7a747b5797 Fix cmake build 2013-09-19 09:46:26 +01:00
Richard Newton
39de9bebcb Merge pull request #669 from hintjens/master
Renamed inproc connect test (name was too long)
2013-09-19 00:43:49 -07:00
Pieter Hintjens
e05556075f Renamed inproc connect test (name was too long) 2013-09-19 09:36:43 +02:00
Richard Newton
de91c7362c Merge pull request #668 from mrothe/no-public-tests
tests: don't listen on public ports
2013-09-18 04:09:51 -07:00
Richard Newton
94c98abba3 Merge pull request #667 from hintjens/master
Reverted pull request 666
2013-09-18 04:07:35 -07:00
Markus Rothe
b13230510c tests: don't listen on public ports 2013-09-18 12:58:19 +02:00
Pieter Hintjens
825052f83f Revert "makes curve keys symetric as in libcurve + factorisation"
This reverts commit bfd472f97cad5e37fa384b687a906f515600bac4.
2013-09-17 14:05:55 +02:00
Pieter Hintjens
22eb4d600b Revert "oblige the application to explicitely set the node type for PLAIN"
This reverts commit 1206f4572b4b3bb405a14cc60605b75d53b819a0.
2013-09-17 14:05:41 +02:00
Pieter Hintjens
9e66685c08 Reformatted text 2013-09-17 13:33:27 +02:00
Pieter Hintjens
dc79171fc3 Merge pull request #666 from lalebarde/master
curve key names as in libcurve, symetry design, a few logic improvements
2013-09-17 04:32:45 -07:00
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