mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-24 02:51:39 +01:00
d5e4319edc
* Extracted connect_vanilla_socket function * Problem: no tests for ZMTP-CURVE protocol errors Solution: added two test cases with erroneous HELLO commands * Problem: insufficient tests for ZMTP-CURVE protocol errors Solution: added two test cases with erroneous HELLO command version * Problem: test HELLO message is invalid apart from deliberate errors Solution: create cryptographically correct HELLO message add tweetnacl.c to test_security_curve * Problem: nonce is incorrect, build fails with GCC Solution: use correct non prefix * Problem: make builds are failing Solution: transfer CMake changes to (auto)make files * Problem: nonce is incorrect, build fails with GCC Solution: use correct non prefix * Problem: make builds are failing Solution: transfer CMake changes to (auto)make files * Problem: no test with INITIATE command with invalid length Solution: added test case * Problem: code duplication between test_security_curve.cpp and curve_client.cpp Solution: extracted parts of zmq::curve_client_t::produce_hello into reusable function * Problem: code duplication between test_security_curve.cpp and curve_client.cpp Solution: extracted further parts of zmq::curve_client_t into reusable functions added missing file * Problem: mechanism_t::add_property can be declared static Solution: declare mechanism_t::add_property static * Problem: intermediate crypto data needs to be passed between static function calls to curve_client_tools_t Solution: add non-static member functions * Problem: msg_t instance may be closed twice Solution: remove offending close * Problem: prepare_hello uses static curve_client_tools_t::produce_hello Solution: Use non-static curve_client_tools_t::produce_hello * Problem: no test with invalid command name where INITIATE command is expected Solution: added test case * Problem: make builds are failing due to curve_client_tools.hpp not being found Solution: add curve_client_tools.hpp to list of source files * Problem: wrong initializer order in zmq::curve_client_t Solution: reorder * Problem: under non-Windows systems, test fails because random_open was not called Solution: call random_open/random_close within test * Problem: conflict between custom function htonll and macro definition on Darwin Solution: define htonll function only if not defined as a macro * Problem: nullptr not defined on all platforms Solution: replace nullptr by NULL * Problem: libsodium builds not working Solution: adapt compile and link file sets for libsodium builds * Problem: Makefile.am broken Solution: Fix syntax * Problem: no tests for garbage encrypted cookie or content in INITIATE Solution: added test cases * Problem: test cases accidentally excluded from build Solution: remove #if/#endif * Solution: some error cases are unreachable Problem: for the time being, added some comments without changing the code * Added comments on hard-to-test cases
92 lines
2.8 KiB
C++
92 lines
2.8 KiB
C++
/*
|
|
Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
|
|
|
|
This file is part of libzmq, the ZeroMQ core engine in C++.
|
|
|
|
libzmq is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU Lesser General Public License (LGPL) as published
|
|
by the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
As a special exception, the Contributors give you permission to link
|
|
this library with independent modules to produce an executable,
|
|
regardless of the license terms of these independent modules, and to
|
|
copy and distribute the resulting executable under terms of your choice,
|
|
provided that you also meet, for each linked independent module, the
|
|
terms and conditions of the license of that module. An independent
|
|
module is a module which is not derived from or based on this library.
|
|
If you modify this library, you must extend this exception to your
|
|
version of the library.
|
|
|
|
libzmq is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
|
License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
|
|
#define __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
|
|
|
|
#ifdef ZMQ_HAVE_CURVE
|
|
|
|
#include "mechanism.hpp"
|
|
#include "options.hpp"
|
|
#include "curve_client_tools.hpp"
|
|
|
|
namespace zmq
|
|
{
|
|
|
|
class msg_t;
|
|
class session_base_t;
|
|
|
|
class curve_client_t : public mechanism_t
|
|
{
|
|
public:
|
|
|
|
curve_client_t (const options_t &options_);
|
|
virtual ~curve_client_t ();
|
|
|
|
// mechanism implementation
|
|
virtual int next_handshake_command (msg_t *msg_);
|
|
virtual int process_handshake_command (msg_t *msg_);
|
|
virtual int encode (msg_t *msg_);
|
|
virtual int decode (msg_t *msg_);
|
|
virtual status_t status () const;
|
|
|
|
private:
|
|
|
|
enum state_t {
|
|
send_hello,
|
|
expect_welcome,
|
|
send_initiate,
|
|
expect_ready,
|
|
error_received,
|
|
connected
|
|
};
|
|
|
|
// Current FSM state
|
|
state_t state;
|
|
|
|
// CURVE protocol tools
|
|
curve_client_tools_t tools;
|
|
|
|
// Nonce
|
|
uint64_t cn_nonce;
|
|
uint64_t cn_peer_nonce;
|
|
|
|
int produce_hello (msg_t *msg_);
|
|
int process_welcome (const uint8_t *cmd_data, size_t data_size);
|
|
int produce_initiate (msg_t *msg_);
|
|
int process_ready (const uint8_t *cmd_data, size_t data_size);
|
|
int process_error (const uint8_t *cmd_data, size_t data_size);
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|