diff options
| -rw-r--r-- | src/sp/transport/tls/tls_tran_test.c | 4 | ||||
| -rw-r--r-- | src/supplemental/tls/tls_test.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c index 94794d6e..d2425b09 100644 --- a/src/sp/transport/tls/tls_tran_test.c +++ b/src/sp/transport/tls/tls_tran_test.c @@ -425,6 +425,8 @@ NUTS_TESTS = { { "tls no delay option", test_tls_no_delay_option }, { "tls keep alive option", test_tls_keep_alive_option }, { "tls recv max", test_tls_recv_max }, - { "tls preshared key", test_tls_psk }, +#ifdef NNG_SUPP_TLS_PSK + { "tls pre-shared key", test_tls_psk }, +#endif { NULL, NULL }, }; diff --git a/src/supplemental/tls/tls_test.c b/src/supplemental/tls/tls_test.c index d4ad2cc4..0aa18708 100644 --- a/src/supplemental/tls/tls_test.c +++ b/src/supplemental/tls/tls_test.c @@ -8,6 +8,7 @@ // #include "nng/nng.h" +#include "nng/supplemental/tls/tls.h" #include <nuts.h> void @@ -221,7 +222,6 @@ test_tls_psk(void) NUTS_PASS(nng_stream_dialer_alloc(&d, addr)); NUTS_PASS(nng_tls_config_alloc(&c2, NNG_TLS_MODE_CLIENT)); NUTS_PASS(nng_tls_config_psk(c2, "identity", key, sizeof(key))); - NUTS_PASS(nng_tls_config_server_name(c2, "localhost")); NUTS_PASS(nng_stream_dialer_set_ptr(d, NNG_OPT_TLS_CONFIG, c2)); @@ -312,7 +312,6 @@ test_tls_psk_server_identities(void) NUTS_PASS(nng_stream_dialer_alloc(&d, addr)); NUTS_PASS(nng_tls_config_alloc(&c2, NNG_TLS_MODE_CLIENT)); NUTS_PASS(nng_tls_config_psk(c2, identity, key, sizeof(key))); - NUTS_PASS(nng_tls_config_server_name(c2, "localhost")); NUTS_PASS(nng_stream_dialer_set_ptr(d, NNG_OPT_TLS_CONFIG, c2)); @@ -478,11 +477,15 @@ TEST_LIST = { { "tls config version", test_tls_config_version }, { "tls conn refused", test_tls_conn_refused }, { "tls large message", test_tls_large_message }, +#ifndef NNG_TLS_ENGINE_WOLFSSL // wolfSSL doesn't validate certas until use { "tls garbled cert", test_tls_garbled_cert }, +#endif +#ifdef NNG_SUPP_TLS_PSK { "tls psk", test_tls_psk }, { "tls psk server identities", test_tls_psk_server_identities }, { "tls psk bad identity", test_tls_psk_bad_identity }, { "tls psk key too big", test_tls_psk_key_too_big }, { "tls psk key config busy", test_tls_psk_config_busy }, +#endif { NULL, NULL }, }; |