Skip to content

L
libzmq
Commit e83abb3d authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub
Browse files
Options

Merge pull request #2652 from sigiesec/curve-security-tests-improvement 

Problem: open TODOs in test code, CI failures
parents e84804d4 7ba70e95
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 144 deletions
tests/test_security_curve.cpp
View file @ e83abb3d
...@@ -41,10 +41,12 @@ ...@@ -41,10 +41,12 @@
#endif #endif
// We'll generate random test keys at startup // We'll generate random test keys at startup
static char client_public [41]; static char valid_client_public [41];
static char client_secret [41]; static char valid_client_secret [41];
static char server_public [41]; static char valid_server_public [41];
static char server_secret [41]; static char valid_server_secret [41];
void *zap_requests_handled;
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
// Read one event off the monitor socket; return value and address // Read one event off the monitor socket; return value and address
...@@ -177,7 +179,7 @@ static void zap_handler_generic (void *handler, zap_protocol_t zap_protocol) ...@@ -177,7 +179,7 @@ static void zap_handler_generic (void *handler, zap_protocol_t zap_protocol)
? "invalid_request_id" ? "invalid_request_id"
: sequence); : sequence);
if (streq (client_key_text, client_public)) { if (streq (client_key_text, valid_client_public)) {
s_sendmore (handler, zap_protocol == zap_status_internal_error s_sendmore (handler, zap_protocol == zap_status_internal_error
? "500" ? "500"
: (zap_protocol == zap_status_invalid : (zap_protocol == zap_status_invalid
...@@ -201,6 +203,8 @@ static void zap_handler_generic (void *handler, zap_protocol_t zap_protocol) ...@@ -201,6 +203,8 @@ static void zap_handler_generic (void *handler, zap_protocol_t zap_protocol)
free (address); free (address);
free (identity); free (identity);
free (mechanism); free (mechanism);
zmq_atomic_counter_inc (zap_requests_handled);
} }
zmq_close (handler); zmq_close (handler);
} }
...@@ -235,13 +239,11 @@ static void zap_handler_too_many_parts (void *handler) ...@@ -235,13 +239,11 @@ static void zap_handler_too_many_parts (void *handler)
zap_handler_generic (handler, zap_too_many_parts); zap_handler_generic (handler, zap_too_many_parts);
} }
void test_garbage_key (void *ctx, void *create_and_connect_curve_client (void *ctx,
void *server,
void *server_mon,
char *my_endpoint,
char *server_public, char *server_public,
char *client_public, char *client_public,
char *client_secret) char *client_secret,
char *my_endpoint)
{ {
void *client = zmq_socket (ctx, ZMQ_DEALER); void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client); assert (client);
...@@ -253,71 +255,90 @@ void test_garbage_key (void *ctx, ...@@ -253,71 +255,90 @@ void test_garbage_key (void *ctx,
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (client, my_endpoint); rc = zmq_connect (client, my_endpoint);
assert (rc == 0); assert (rc == 0);
return client;
}
void expect_new_client_curve_bounce_fail (void *ctx,
char *server_public,
char *client_public,
char *client_secret,
char *my_endpoint,
void *server)
{
void *client = create_and_connect_curve_client (
ctx, server_public, client_public, client_secret, my_endpoint);
expect_bounce_fail (server, client); expect_bounce_fail (server, client);
close_zero_linger (client); close_zero_linger (client);
}
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
// expects that one or more occurrences of the expected event are received
// via the specified socket monitor
// returns the number of occurrences of the expected event
// interrupts, if a ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL/EPIPE occurs;
// in this case, 0 is returned
// this should be investigated further, see
// https://github.com/zeromq/libzmq/issues/2644
int expect_monitor_event_multiple (void *server_mon,
int expected_event,
int expected_err = -1)
{
int count_of_expected_events = 0;
int client_closed_connection = 0;
int timeout = -1; int timeout = -1;
int handshake_failed_encryption_event_count = 0;
int handshake_failed_client_closed = 0;
int err;
int event; int event;
int event_count = 0; int err;
while ( while (
(event = get_monitor_event_with_timeout (server_mon, &err, NULL, timeout)) (event = get_monitor_event_with_timeout (server_mon, &err, NULL, timeout))
!= -1) { != -1) {
++event_count;
timeout = 250; timeout = 250;
switch (event) {
case ZMQ_EVENT_HANDSHAKE_FAILED_ENCRYPTION: // ignore errors with EPIPE, which happen sporadically, see above
++handshake_failed_encryption_event_count; if (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL && err == EPIPE) {
fprintf (stderr, "Ignored event: %x (err = %i)\n", event, err);
client_closed_connection = 1;
break; break;
case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL:
// ignore errors with EPIPE, which happen sporadically
if (err == EPIPE) {
fprintf (stderr, "Ignored event: %x (err = %i)\n", event,
err);
++handshake_failed_client_closed;
continue;
} }
default: if (event != expected_event
fprintf (stderr, "Unexpected event: %x (err = %i)\n", event, || (-1 != expected_err && err != expected_err)) {
err); fprintf (stderr, "Unexpected event: %x (err = %i)\n", event, err);
assert (false); assert (false);
} }
if (handshake_failed_encryption_event_count == 2 ++count_of_expected_events;
|| handshake_failed_client_closed == 1)
break;
} }
fprintf (stderr, assert (count_of_expected_events > 0 || client_closed_connection);
"event_count == %i, "
"handshake_failed_encryption_event_count == %i, " return count_of_expected_events;
"handshake_failed_client_closed = %i\n", }
event_count, handshake_failed_encryption_event_count, #endif
handshake_failed_client_closed);
// handshake_failed_encryption_event_count should be two because void test_garbage_key(void *ctx,
void *server,
void *server_mon,
char *my_endpoint,
char *server_public,
char *client_public,
char *client_secret)
{
expect_new_client_curve_bounce_fail (ctx, server_public, client_public,
client_secret, my_endpoint, server);
#ifdef ZMQ_BUILD_DRAFT_API
int handshake_failed_encryption_event_count =
expect_monitor_event_multiple (server_mon,
ZMQ_EVENT_HANDSHAKE_FAILED_ENCRYPTION);
// handshake_failed_encryption_event_count should be at least two because
// expect_bounce_fail involves two exchanges // expect_bounce_fail involves two exchanges
// however, with valgrind we see only one event (maybe the next one takes // however, with valgrind we see only one event (maybe the next one takes
// very long, or does not happen at all because something else takes very // very long, or does not happen at all because something else takes very
// long) // long)
// cases where handshake_failed_client_closed == 1 should be
// investigated further, see https://github.com/zeromq/libzmq/issues/2644
assert (handshake_failed_encryption_event_count >= 1
|| handshake_failed_client_closed == 1);
// Even though the client socket is closed, the server still handles HELLO fprintf (stderr,
// messages. Output them for diagnostic purposes. "count of ZMQ_EVENT_HANDSHAKE_FAILED_ENCRYPTION events: %i\n",
handshake_failed_encryption_event_count);
do {
int err;
event =
get_monitor_event_with_timeout (server_mon, &err, NULL, timeout);
if (event != -1) {
fprintf (stderr, "Flushed event: %x (errno = %i)\n", event, err);
}
} while (event != -1);
#endif #endif
} }
...@@ -333,6 +354,9 @@ void setup_context_and_server_side (void **ctx, ...@@ -333,6 +354,9 @@ void setup_context_and_server_side (void **ctx,
assert (*ctx); assert (*ctx);
// Spawn ZAP handler // Spawn ZAP handler
zap_requests_handled = zmq_atomic_counter_new ();
assert (zap_requests_handled != NULL);
// We create and bind ZAP socket in main thread to avoid case // We create and bind ZAP socket in main thread to avoid case
// where child thread does not start up fast enough. // where child thread does not start up fast enough.
*handler = zmq_socket (*ctx, ZMQ_REP); *handler = zmq_socket (*ctx, ZMQ_REP);
...@@ -349,7 +373,7 @@ void setup_context_and_server_side (void **ctx, ...@@ -349,7 +373,7 @@ void setup_context_and_server_side (void **ctx,
rc = zmq_setsockopt (*server, ZMQ_CURVE_SERVER, &as_server, sizeof (int)); rc = zmq_setsockopt (*server, ZMQ_CURVE_SERVER, &as_server, sizeof (int));
assert (rc == 0); assert (rc == 0);
rc = zmq_setsockopt (*server, ZMQ_CURVE_SECRETKEY, server_secret, 41); rc = zmq_setsockopt (*server, ZMQ_CURVE_SECRETKEY, valid_server_secret, 41);
assert (rc == 0); assert (rc == 0);
rc = zmq_setsockopt (*server, ZMQ_IDENTITY, "IDENT", 6); rc = zmq_setsockopt (*server, ZMQ_IDENTITY, "IDENT", 6);
...@@ -398,23 +422,17 @@ void shutdown_context_and_server_side (void *ctx, ...@@ -398,23 +422,17 @@ void shutdown_context_and_server_side (void *ctx,
// Wait until ZAP handler terminates // Wait until ZAP handler terminates
zmq_threadclose (zap_thread); zmq_threadclose (zap_thread);
zmq_atomic_counter_destroy (&zap_requests_handled);
} }
void test_curve_security_with_valid_credentials ( void test_curve_security_with_valid_credentials (
void *ctx, char *my_endpoint, void *server, void *server_mon, int timeout) void *ctx, char *my_endpoint, void *server, void *server_mon, int timeout)
{ {
void *client = zmq_socket (ctx, ZMQ_DEALER); void *client = create_and_connect_curve_client (
assert (client); ctx, valid_server_public, valid_client_public, valid_client_secret, my_endpoint);
int rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 41);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
bounce (server, client); bounce (server, client);
rc = zmq_close (client); int rc = zmq_close (client);
assert (rc == 0); assert (rc == 0);
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
...@@ -433,18 +451,8 @@ void test_curve_security_with_bogus_client_credentials ( ...@@ -433,18 +451,8 @@ void test_curve_security_with_bogus_client_credentials (
char bogus_secret [41]; char bogus_secret [41];
zmq_curve_keypair (bogus_public, bogus_secret); zmq_curve_keypair (bogus_public, bogus_secret);
void *client = zmq_socket (ctx, ZMQ_DEALER); expect_new_client_curve_bounce_fail (ctx, valid_server_public, bogus_public,
assert (client); bogus_secret, my_endpoint, server);
int rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, bogus_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, bogus_secret, 41);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
expect_bounce_fail (server, client);
close_zero_linger (client);
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
int event = get_monitor_event (server_mon, NULL, NULL, 0); int event = get_monitor_event (server_mon, NULL, NULL, 0);
...@@ -455,16 +463,14 @@ void test_curve_security_with_bogus_client_credentials ( ...@@ -455,16 +463,14 @@ void test_curve_security_with_bogus_client_credentials (
assert_no_more_monitor_events_with_timeout (server_mon, timeout); assert_no_more_monitor_events_with_timeout (server_mon, timeout);
#endif #endif
// there may be more than one ZAP request due to repeated attempts by the client
assert (1 <= zmq_atomic_counter_value (zap_requests_handled));
} }
void test_curve_security_with_null_client_credentials (void *ctx, void expect_zmtp_failure (void *client, char *my_endpoint, void *server, void *server_mon)
char *my_endpoint,
void *server,
void *server_mon)
{ {
// This must be caught by the curve_server class, not passed to ZAP // This must be caught by the curve_server class, not passed to ZAP
void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
int rc = zmq_connect (client, my_endpoint); int rc = zmq_connect (client, my_endpoint);
assert (rc == 0); assert (rc == 0);
expect_bounce_fail (server, client); expect_bounce_fail (server, client);
...@@ -477,24 +483,34 @@ void test_curve_security_with_null_client_credentials (void *ctx, ...@@ -477,24 +483,34 @@ void test_curve_security_with_null_client_credentials (void *ctx,
assert (event == ZMQ_EVENT_HANDSHAKE_FAILED_ZMTP assert (event == ZMQ_EVENT_HANDSHAKE_FAILED_ZMTP
|| (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL && err == EPIPE)); || (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL && err == EPIPE));
#endif #endif
assert (0 == zmq_atomic_counter_value (zap_requests_handled));
} }
void test_curve_security_with_plain_client_credentials (void *ctx, void *server, void test_curve_security_with_null_client_credentials (void *ctx,
char *my_endpoint) char *my_endpoint,
void *server,
void *server_mon)
{
void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
expect_zmtp_failure (client, my_endpoint, server, server_mon);
}
void test_curve_security_with_plain_client_credentials (void *ctx,
char *my_endpoint,
void *server,
void *server_mon)
{ {
// This must be caught by the curve_server class, not passed to ZAP
void *client = zmq_socket (ctx, ZMQ_DEALER); void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client); assert (client);
int rc = zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5); int rc = zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5);
assert (rc == 0); assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8); rc = zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8);
assert (rc == 0); assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
expect_bounce_fail (server, client);
close_zero_linger (client);
// TODO add assertion here as in test_curve_security_with_null_client_credentials expect_zmtp_failure (client, my_endpoint, server, server_mon);
} }
void test_curve_security_unauthenticated_message (char *my_endpoint, void test_curve_security_unauthenticated_message (char *my_endpoint,
...@@ -538,50 +554,27 @@ void test_curve_security_zap_unsuccessful (void *ctx, ...@@ -538,50 +554,27 @@ void test_curve_security_zap_unsuccessful (void *ctx,
char *my_endpoint, char *my_endpoint,
void *server, void *server,
void *server_mon, void *server_mon,
int timeout,
int expected_event, int expected_event,
int expected_err) int expected_err)
{ {
// TODO remove code duplication expect_new_client_curve_bounce_fail (
void *client = zmq_socket (ctx, ZMQ_DEALER); ctx, valid_server_public, valid_client_public, valid_client_secret,
assert (client); my_endpoint, server);
int rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 41);
assert (rc == 0);
rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 41);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
expect_bounce_fail (server, client);
close_zero_linger (client);
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
int count_of_expected_events = 0; expect_monitor_event_multiple (server_mon, expected_event, expected_err);
int event;
int err;
while (
(event = get_monitor_event_with_timeout (server_mon, &err, NULL, timeout))
!= -1) {
if (event == expected_event) {
++count_of_expected_events;
if (err != expected_err) {
fprintf (stderr, "Unexpected event: %x (err = %i)\n", event,
err);
assert (false);
}
}
}
assert (count_of_expected_events > 0);
#endif #endif
// there may be more than one ZAP request due to repeated attempts by the client
assert (1 <= zmq_atomic_counter_value (zap_requests_handled));
} }
void test_curve_security_zap_protocol_error( void test_curve_security_zap_protocol_error (void *ctx,
void *ctx, char *my_endpoint, void *server, void *server_mon, int timeout) char *my_endpoint,
void *server,
void *server_mon)
{ {
test_curve_security_zap_unsuccessful ( test_curve_security_zap_unsuccessful (ctx, my_endpoint, server, server_mon,
ctx, my_endpoint, server, server_mon, timeout,
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
ZMQ_EVENT_HANDSHAKE_FAILED_ZAP, EPROTO ZMQ_EVENT_HANDSHAKE_FAILED_ZAP, EPROTO
#else #else
...@@ -596,13 +589,13 @@ void test_curve_security_invalid_keysize (void *ctx) ...@@ -596,13 +589,13 @@ void test_curve_security_invalid_keysize (void *ctx)
void *client = zmq_socket (ctx, ZMQ_DEALER); void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client); assert (client);
errno = 0; errno = 0;
int rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 123); int rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, valid_server_public, 123);
assert (rc == -1 && errno == EINVAL); assert (rc == -1 && errno == EINVAL);
errno = 0; errno = 0;
rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 123); rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, valid_client_public, 123);
assert (rc == -1 && errno == EINVAL); assert (rc == -1 && errno == EINVAL);
errno = 0; errno = 0;
rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 123); rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, valid_client_secret, 123);
assert (rc == -1 && errno == EINVAL); assert (rc == -1 && errno == EINVAL);
rc = zmq_close (client); rc = zmq_close (client);
assert (rc == 0); assert (rc == 0);
...@@ -616,9 +609,9 @@ int main (void) ...@@ -616,9 +609,9 @@ int main (void)
} }
// Generate new keypairs for these tests // Generate new keypairs for these tests
int rc = zmq_curve_keypair (client_public, client_secret); int rc = zmq_curve_keypair (valid_client_public, valid_client_secret);
assert (rc == 0); assert (rc == 0);
rc = zmq_curve_keypair (server_public, server_secret); rc = zmq_curve_keypair (valid_server_public, valid_server_secret);
assert (rc == 0); assert (rc == 0);
int timeout = 250; int timeout = 250;
...@@ -646,7 +639,7 @@ int main (void) ...@@ -646,7 +639,7 @@ int main (void)
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
&server_mon, my_endpoint); &server_mon, my_endpoint);
test_garbage_key (ctx, server, server_mon, my_endpoint, garbage_key, test_garbage_key (ctx, server, server_mon, my_endpoint, garbage_key,
client_public, client_secret); valid_client_public, valid_client_secret);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// Check CURVE security with a garbage client public key // Check CURVE security with a garbage client public key
...@@ -654,8 +647,8 @@ int main (void) ...@@ -654,8 +647,8 @@ int main (void)
fprintf (stderr, "test_garbage_client_public_key\n"); fprintf (stderr, "test_garbage_client_public_key\n");
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
&server_mon, my_endpoint); &server_mon, my_endpoint);
test_garbage_key (ctx, server, server_mon, my_endpoint, server_public, test_garbage_key (ctx, server, server_mon, my_endpoint, valid_server_public,
garbage_key, client_secret); garbage_key, valid_client_secret);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// Check CURVE security with a garbage client secret key // Check CURVE security with a garbage client secret key
...@@ -663,8 +656,8 @@ int main (void) ...@@ -663,8 +656,8 @@ int main (void)
fprintf (stderr, "test_garbage_client_secret_key\n"); fprintf (stderr, "test_garbage_client_secret_key\n");
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
&server_mon, my_endpoint); &server_mon, my_endpoint);
test_garbage_key (ctx, server, server_mon, my_endpoint, server_public, test_garbage_key (ctx, server, server_mon, my_endpoint, valid_server_public,
client_public, garbage_key); valid_client_public, garbage_key);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
...@@ -681,7 +674,8 @@ int main (void) ...@@ -681,7 +674,8 @@ int main (void)
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
&server_mon, my_endpoint); &server_mon, my_endpoint);
test_curve_security_with_plain_client_credentials (ctx, server, my_endpoint); test_curve_security_with_plain_client_credentials (ctx, my_endpoint, server,
server_mon);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
setup_context_and_server_side (&ctx, &handler, &zap_thread, &server, setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
...@@ -696,7 +690,7 @@ int main (void) ...@@ -696,7 +690,7 @@ int main (void)
&server_mon, my_endpoint, &server_mon, my_endpoint,
&zap_handler_wrong_version); &zap_handler_wrong_version);
test_curve_security_zap_protocol_error (ctx, my_endpoint, server, test_curve_security_zap_protocol_error (ctx, my_endpoint, server,
server_mon, timeout); server_mon);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// wrong request id // wrong request id
...@@ -704,7 +698,7 @@ int main (void) ...@@ -704,7 +698,7 @@ int main (void)
&server_mon, my_endpoint, &server_mon, my_endpoint,
&zap_handler_wrong_request_id); &zap_handler_wrong_request_id);
test_curve_security_zap_protocol_error (ctx, my_endpoint, server, test_curve_security_zap_protocol_error (ctx, my_endpoint, server,
server_mon, timeout); server_mon);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// status invalid (not a 3-digit number) // status invalid (not a 3-digit number)
...@@ -712,7 +706,7 @@ int main (void) ...@@ -712,7 +706,7 @@ int main (void)
&server_mon, my_endpoint, &server_mon, my_endpoint,
&zap_handler_wrong_status_invalid); &zap_handler_wrong_status_invalid);
test_curve_security_zap_protocol_error (ctx, my_endpoint, server, test_curve_security_zap_protocol_error (ctx, my_endpoint, server,
server_mon, timeout); server_mon);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// too many parts // too many parts
...@@ -720,7 +714,7 @@ int main (void) ...@@ -720,7 +714,7 @@ int main (void)
&server_mon, my_endpoint, &server_mon, my_endpoint,
&zap_handler_too_many_parts); &zap_handler_too_many_parts);
test_curve_security_zap_protocol_error (ctx, my_endpoint, server, test_curve_security_zap_protocol_error (ctx, my_endpoint, server,
server_mon, timeout); server_mon);
shutdown_context_and_server_side (ctx, zap_thread, server, server_mon); shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
// ZAP non-standard cases // ZAP non-standard cases
...@@ -732,10 +726,10 @@ int main (void) ...@@ -732,10 +726,10 @@ int main (void)
// TODO is this usable? EAGAIN does not appear to be an appropriate error // TODO is this usable? EAGAIN does not appear to be an appropriate error
// code, and the status text is completely lost // code, and the status text is completely lost
test_curve_security_zap_unsuccessful ( test_curve_security_zap_unsuccessful (ctx, my_endpoint, server, server_mon,
ctx, my_endpoint, server, server_mon, timeout,
#ifdef ZMQ_BUILD_DRAFT_API #ifdef ZMQ_BUILD_DRAFT_API
ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL, EAGAIN ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL,
EAGAIN
#else #else
0, 0 0, 0
#endif #endif
......
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