summaryrefslogtreecommitdiff
path: root/tests/ws.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-01-11 14:58:09 -0800
committerGarrett D'Amore <garrett@damore.org>2018-01-16 08:45:11 -0800
commitbbf012364d9f1482b16c97b8bfd2fd07130446ca (patch)
tree2cb45903b0d5aa756d44f27b39a99c318a99a9a2 /tests/ws.c
parent18229bbb69423d64d0a1b98bcf4bf3e24fba3aa4 (diff)
downloadnng-bbf012364d9f1482b16c97b8bfd2fd07130446ca.tar.gz
nng-bbf012364d9f1482b16c97b8bfd2fd07130446ca.tar.bz2
nng-bbf012364d9f1482b16c97b8bfd2fd07130446ca.zip
fixes #201 TLS configuration should support files for certificates and keys
This adds support for configuration of TLS websockets using the files for keys, certificates, and CRLs. Significant changes to the websocket, TLS, and HTTP layers were made here. We now expect TLS configuration to be tied to the HTTP layer, and the HTTP code creates default configuration objects based on the URL supplied. (HTTP dialers and listeners are now created with a URL rather than a sockaddr, giving them access to the scheme as well.) We fixed several bugs affecting TLS validation, and added a test suite that confirms that validation works as it should. We also fixed an orphaned socket during HTTP negotiation, responsible for an occasional assertion error if the http handshake does not complete successfully. Finally several use-after-free races were closed. TLS layer changes include reporting of handshake failures using newly created "standard" error codes for peer authentication and cryptographic failures. The use of the '*' wild card in URLs at bind time is no longer supported for websocket at least. Documentation updates for all this are in place as well.
Diffstat (limited to 'tests/ws.c')
-rw-r--r--tests/ws.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ws.c b/tests/ws.c
index 38db4738..0527337e 100644
--- a/tests/ws.c
+++ b/tests/ws.c
@@ -80,7 +80,7 @@ TestMain("WebSocket Transport", {
trantest_test_extended("ws://127.0.0.1:%u/test", check_props_v4);
- Convey("Wild cards work", {
+ Convey("Empty hostname works", {
nng_socket s1;
nng_socket s2;
char addr[NNG_MAXADDRLEN];
@@ -91,7 +91,7 @@ TestMain("WebSocket Transport", {
nng_close(s2);
nng_close(s1);
});
- trantest_next_address(addr, "ws://*:%u/test");
+ trantest_next_address(addr, "ws://:%u/test");
So(nng_listen(s1, addr, NULL, 0) == 0);
nng_msleep(100);
// reset port back one
@@ -110,10 +110,10 @@ TestMain("WebSocket Transport", {
nng_close(s2);
nng_close(s1);
});
- trantest_next_address(addr, "ws://*:%u/test");
+ trantest_next_address(addr, "ws://:%u/test");
So(nng_listen(s1, addr, NULL, 0) == 0);
// reset port back one
- trantest_prev_address(addr, "ws://127.0.0.1:%u/nothere");
+ trantest_prev_address(addr, "ws://localhost:%u/nothere");
So(nng_dial(s2, addr, NULL, 0) == NNG_ECONNREFUSED);
});