diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tls.c | 18 | ||||
| -rw-r--r-- | tests/wss.c | 26 |
2 files changed, 20 insertions, 24 deletions
diff --git a/tests/tls.c b/tests/tls.c index 70b22fea..fe8aea1e 100644 --- a/tests/tls.c +++ b/tests/tls.c @@ -110,7 +110,7 @@ init_dialer_tls(trantest *tt, nng_dialer d) nng_tls_config *cfg; int rv; - if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_CLIENT)) != 0) { + if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_CLIENT)) != 0) { return (rv); } if ((rv = nng_tls_config_ca_cert( @@ -124,7 +124,7 @@ init_dialer_tls(trantest *tt, nng_dialer d) rv = nng_dialer_setopt_ptr(d, NNG_OPT_TLS_CONFIG, cfg); out: - nng_tls_config_fini(cfg); + nng_tls_config_free(cfg); return (rv); } @@ -134,25 +134,23 @@ init_listener_tls(trantest *tt, nng_listener l) nng_tls_config *cfg; int rv; - if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_SERVER)) != 0) { + if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_SERVER)) != 0) { return (rv); } if ((rv = nng_tls_config_cert( cfg, (void *) server_cert, sizeof(server_cert))) != 0) { - nng_tls_config_fini(cfg); - return (rv); + goto out; } if ((rv = nng_tls_config_key( cfg, (void *) server_key, sizeof(server_key))) != 0) { - nng_tls_config_fini(cfg); - return (rv); + goto out; } if ((rv = nng_listener_setopt_ptr(l, NNG_OPT_TLS_CONFIG, cfg)) != 0) { - nng_tls_config_fini(cfg); - return (rv); + goto out; } - nng_tls_config_fini(cfg); +out: + nng_tls_config_free(cfg); return (0); } diff --git a/tests/wss.c b/tests/wss.c index 2f701117..151b4287 100644 --- a/tests/wss.c +++ b/tests/wss.c @@ -141,7 +141,7 @@ init_dialer_wss(trantest *tt, nng_dialer d) nng_tls_config *cfg; int rv; - if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_CLIENT)) != 0) { + if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_CLIENT)) != 0) { return (rv); } if ((rv = nng_tls_config_ca_cert( @@ -155,7 +155,7 @@ init_dialer_wss(trantest *tt, nng_dialer d) rv = nng_dialer_setopt_ptr(d, NNG_OPT_WSS_TLS_CONFIG, cfg); out: - nng_tls_config_fini(cfg); + nng_tls_config_free(cfg); return (rv); } @@ -165,31 +165,29 @@ init_listener_wss(trantest *tt, nng_listener l) nng_tls_config *cfg; int rv; - if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_SERVER)) != 0) { + if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_SERVER)) != 0) { return (rv); } if ((rv = nng_tls_config_cert( cfg, (void *) server_cert, sizeof(server_cert))) != 0) { - nng_tls_config_fini(cfg); - return (rv); + goto out; } if ((rv = nng_tls_config_key( cfg, (void *) server_key, sizeof(server_key))) != 0) { - nng_tls_config_fini(cfg); - return (rv); + goto out; } if ((rv = nng_listener_setopt_ptr(l, NNG_OPT_WSS_TLS_CONFIG, cfg)) != 0) { - // We can wind up with EBUSY from the server - // already running. - if (rv != NNG_EBUSY) { - nng_tls_config_fini(cfg); - return (rv); + // We can wind up with EBUSY from the server already running. + if (rv == NNG_EBUSY) { + rv = 0; } } - nng_tls_config_fini(cfg); - return (0); + +out: + nng_tls_config_free(cfg); + return (rv); } TestMain("WebSocket Secure (TLS) Transport", { |