Commit 10f69c15 authored by Pieter Hintjens's avatar Pieter Hintjens

Clarified man pages on mixed security

parent d9bb1672
...@@ -17,8 +17,11 @@ by this document: <http://rfc.zeromq.org/spec:25>. ...@@ -17,8 +17,11 @@ by this document: <http://rfc.zeromq.org/spec:25>.
CLIENT AND SERVER ROLES CLIENT AND SERVER ROLES
----------------------- -----------------------
A socket using CURVE can be either client or server but not both. The role A socket using CURVE can be either client or server, at any moment, but
is independent of bind/connect direction. not both. The role is independent of bind/connect direction.
A socket can change roles at any point by setting new options. The role
affects all zmq_connect and zmq_bind calls that follow it.
To become a CURVE server, the application sets the ZMQ_CURVE_SERVER option To become a CURVE server, the application sets the ZMQ_CURVE_SERVER option
on the socket, and then sets the ZMQ_CURVE_SECRETKEY option to provide the on the socket, and then sets the ZMQ_CURVE_SECRETKEY option to provide the
...@@ -27,9 +30,9 @@ socket with its long-term public key, which is used only by clients. ...@@ -27,9 +30,9 @@ socket with its long-term public key, which is used only by clients.
To become a CURVE client, the application sets the ZMQ_CURVE_SERVERKEY To become a CURVE client, the application sets the ZMQ_CURVE_SERVERKEY
option with the long-term public key of the server it intends to connect option with the long-term public key of the server it intends to connect
to. A CURVE client can connect to (or accept connections from) at most to, or accept connections from, next. The application then sets the
one CURVE server. The application then sets the ZMQ_CURVE_PUBLICKEY and ZMQ_CURVE_PUBLICKEY and ZMQ_CURVE_SECRETKEY options with its client
ZMQ_CURVE_SECRETKEY options with its client long-term key pair. long-term key pair.
If the server does authentication it will be based on the client's long If the server does authentication it will be based on the client's long
term public key. term public key.
......
...@@ -13,8 +13,10 @@ SYNOPSIS ...@@ -13,8 +13,10 @@ SYNOPSIS
*int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');* *int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');*
Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE, Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE,
ZMQ_LINGER, ZMQ_ROUTER_MANDATORY, ZMQ_PROBE_ROUTER, and ZMQ_XPUB_VERBOSE ZMQ_LINGER, ZMQ_ROUTER_MANDATORY, ZMQ_PROBE_ROUTER, ZMQ_XPUB_VERBOSE only
only take effect for subsequent socket bind/connects. take effect for subsequent socket bind/connects. Specifically, security
options take effect for subsequent binds/connects and can be changed at any
time to affect subsequent binds and/or connects.
DESCRIPTION DESCRIPTION
----------- -----------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment