0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 07:31:03 +08:00

3166 Commits

Author SHA1 Message Date
Chris Busbey
d1334d9df8 using latest copyright header 2014-04-24 14:39:29 -07:00
Chris Busbey
634c8abe29 encrypt option on gss ready 2014-04-24 14:21:33 -07:00
Chris Busbey
27591d2da6 ZMQ_GSSAPI_PLAINTEXT option for disabling encryption 2014-04-24 14:21:33 -07:00
Chris Busbey
18da8a7402 encode and decode ready message 2014-04-24 14:20:54 -07:00
Chris Busbey
2e1645a519 principle->principal 2014-04-24 14:20:53 -07:00
Chris Busbey
87834dd63f fixed up comments from pr 2014-04-24 14:18:58 -07:00
Chris Busbey
5441db3d7d configurable principle and service principle (for client) 2014-04-24 14:18:58 -07:00
Chris Busbey
4e6880ec95 gss mech sends principle as part of zap request 2014-04-24 14:17:36 -07:00
Chris Busbey
be62be0fa4 gss encode/decode 'more' flag 2014-04-24 14:17:36 -07:00
Chris Busbey
778c72b9ed :fixed client state transition bug 2014-04-24 14:17:36 -07:00
Chris Busbey
04db842dcc added ready for meta data exchange at end of gss handshake 2014-04-24 14:17:36 -07:00
Mike Gatny
761508bf4b Added comments to methods. 2014-04-24 14:17:36 -07:00
Mike Gatny
3c414c4aac GSSAPI mechanism now fully working with encryption 2014-04-24 14:17:36 -07:00
Mike Gatny
eb2862525b Methods to send/recv gssapi-wrapped messages 2014-04-24 14:17:36 -07:00
Mike Gatny
1445516c41 Establishing GSSAPI sec context is working now 2014-04-24 14:17:36 -07:00
Mike Gatny
6290ba168f Added gss produce/process routines.
For exchanging tokens.
2014-04-24 14:17:05 -07:00
Mike Gatny
c00b8c347b Refactored common impl into gssapi_mechanism_base.
E.g., both client and server need to produce and process GSSAPI tokens.
2014-04-24 14:17:05 -07:00
Mike Gatny
a4a0dc6644 Split up gssapi mechanism into client and server. 2014-04-24 14:17:05 -07:00
Mike Gatny
abcb224318 stubbed in TOKEN command 2014-04-24 14:17:05 -07:00
Mike Gatny
4b1c851db4 Stubbed in gssapi security mechanism. 2014-04-24 14:17:05 -07:00
Pieter Hintjens
d1bdd45e80 Merge pull request #975 from evoskuil/master
Update file tools versioning in VS projects.
2014-04-17 18:21:35 +02:00
evoskuil
1ee980c191 Update filter file tool versions. 2014-04-15 01:43:24 -07:00
evoskuil
5a76db6f27 Merge branch 'zeromq/master'
Conflicts:
	builds/msvc/vs2010/inproc_lat/inproc_lat.props
	builds/msvc/vs2010/inproc_thr/inproc_thr.props
	builds/msvc/vs2010/libsodium.import.props
	builds/msvc/vs2010/libzmq.import.props
	builds/msvc/vs2010/libzmq/libzmq.props
	builds/msvc/vs2010/local_lat/local_lat.props
	builds/msvc/vs2010/local_thr/local_thr.props
	builds/msvc/vs2010/properties/Common.props
	builds/msvc/vs2010/properties/Console.props
	builds/msvc/vs2010/properties/ConsoleDebugDynamic.props
	builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleDebugStatic.props
	builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props
	builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleReleaseStatic.props
	builds/msvc/vs2010/properties/Debug.props
	builds/msvc/vs2010/properties/Dynamic.props
	builds/msvc/vs2010/properties/DynamicDebug.props
	builds/msvc/vs2010/properties/DynamicRelease.props
	builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Release.props
	builds/msvc/vs2010/properties/Static.props
	builds/msvc/vs2010/properties/StaticDebug.props
	builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticRelease.props
	builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Win32.props
	builds/msvc/vs2010/properties/x64.props
	builds/msvc/vs2010/remote_lat/remote_lat.props
	builds/msvc/vs2010/remote_thr/remote_thr.props
2014-04-14 23:47:55 -07:00
evoskuil
d03a1b0d5b Fix platform tools versioning on project files. 2014-04-14 19:19:30 -07:00
evoskuil
bd45b74dd3 Remove versioning from VS .props files. 2014-04-14 19:18:36 -07:00
Pieter Hintjens
cfe2036008 Merge pull request #974 from xantares/master
Fixed mingw poll detection
2014-04-14 21:54:19 +02:00
xantares
ce4c4f2a05 Fixed mingw poll detection 2014-04-14 21:49:57 +02:00
Pieter Hintjens
98a64716ab Merge pull request #973 from HughPowell/master
Change ToolsVersion to 4.0 for VS2010
2014-04-14 21:40:14 +02:00
Hugh Powell
213d111def Reference default locations for libsodium for VS2010 2014-04-14 20:13:39 +01:00
Hugh Powell
6cb742c7bb Change ToolsVersion to 4.0 for VS2010 2014-04-14 20:01:47 +01:00
Pieter Hintjens
6409c0ec1c Merge pull request #972 from mditzel/master
Fix issue #971
2014-04-14 14:13:49 +02:00
Maarten Ditzel
802d1bcb03 Fix issue #971 2014-04-14 13:56:01 +02:00
Maarten Ditzel
91e77e6aa4 Fix issue #969 2014-04-13 15:25:22 +02:00
Pieter Hintjens
d40580c368 Merge pull request #970 from mditzel/master
Fix issue #969
2014-04-13 14:31:40 +02:00
Ian Barber
52cfab3e21 Merge pull request #968 from hintjens/master
Fixed issue #967
2014-04-10 10:11:23 +01:00
Pieter Hintjens
407b7fb474 Removed duplicate zmq_z85_* methods from zmq.h
Fixes #967
2014-04-10 09:43:16 +02:00
Ian Barber
b9823a1388 Merge pull request #965 from evoskuil/master
Update VS build configurations.
2014-04-09 12:18:05 +01:00
evoskuil
51be440a28 Update VS build configurations. 2014-04-09 03:27:27 -07:00
Pieter Hintjens
f9ef2dd343 Merge pull request #964 from evoskuil/master
Incorporate libsodium option and linkage, generalize, update packaging.
2014-04-08 06:22:08 +01:00
evoskuil
c392c266df Merge branch 'evoskuil/master' 2014-04-07 19:40:31 -07:00
evoskuil
34f4851c23 Incorporate libsodium option and linkage, generalize, update packaging. 2014-04-07 19:38:59 -07:00
Pieter Hintjens
dd227d7a11 Merge pull request #961 from evoskuil/master
Update NuGet packaging metadata.
2014-04-07 08:46:28 +02:00
evoskuil
f01b48c484 Update packaging metadata. 2014-04-06 22:53:36 -07:00
Pieter Hintjens
28c074ee63 Merge pull request #960 from evoskuil/master
Rationalize and update Visual Studio projects and packaging.
2014-04-06 13:32:20 +02:00
evoskuil
b7675eaace Update packaging metadata. 2014-04-06 03:41:35 -07:00
evoskuil
69fa001bab Merge branch 'evoskuil/master' 2014-04-06 02:52:06 -07:00
evoskuil
e01801f5b9 Rationalize and update Visual Studio projects and packaging. 2014-04-06 02:39:15 -07:00
Pieter Hintjens
8fcda0d5da Cleaned up XFAIL on resources
- this failing test was confusing users
- ZMTP v3.0 now does not define resources at all
- resources, along with other unimplemented aspects moved to
  RFC 37 ZMTP v3.1
2014-04-05 15:32:43 +02:00
Pieter Hintjens
84bf625477 Merge pull request #959 from evoskuil/master
Update and add executable projects to VS2013 solution.
2014-04-04 12:31:42 +02:00
evoskuil
cbbfa14798 Merge branch 'zeromq/master' 2014-04-04 01:18:30 -07:00