diff options
| author | Garrett D'Amore <garrett@damore.org> | 2025-01-01 13:10:08 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2025-01-01 13:15:31 -0800 |
| commit | 8294f8993d10385e8470ce8270a8bf64047b8b07 (patch) | |
| tree | 68dc3cd8cd6fb420b2ef97921c1ce94c8ce5d284 /src/supplemental | |
| parent | 61d581e2343af9677815fa7dc13e8a36a6f5ec3e (diff) | |
| download | nng-8294f8993d10385e8470ce8270a8bf64047b8b07.tar.gz nng-8294f8993d10385e8470ce8270a8bf64047b8b07.tar.bz2 nng-8294f8993d10385e8470ce8270a8bf64047b8b07.zip | |
base64: move it to private for websockets
There are no other consumers for this, and reasonably unlikely to
be others for now. (Other use cases are JWTs, but that would be
another whole set of functionality that we're not ready to take on.)
Diffstat (limited to 'src/supplemental')
| -rw-r--r-- | src/supplemental/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/supplemental/base64/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/supplemental/websocket/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/supplemental/websocket/base64.c (renamed from src/supplemental/base64/base64.c) | 0 | ||||
| -rw-r--r-- | src/supplemental/websocket/base64.h (renamed from src/supplemental/base64/base64.h) | 0 | ||||
| -rw-r--r-- | src/supplemental/websocket/base64_test.c (renamed from src/supplemental/base64/base64_test.c) | 0 | ||||
| -rw-r--r-- | src/supplemental/websocket/websocket.c | 3 |
7 files changed, 3 insertions, 19 deletions
diff --git a/src/supplemental/CMakeLists.txt b/src/supplemental/CMakeLists.txt index 9bbddc44..9a54beea 100644 --- a/src/supplemental/CMakeLists.txt +++ b/src/supplemental/CMakeLists.txt @@ -9,7 +9,6 @@ nng_directory(supplemental) -add_subdirectory(base64) add_subdirectory(http) add_subdirectory(tls) add_subdirectory(util) diff --git a/src/supplemental/base64/CMakeLists.txt b/src/supplemental/base64/CMakeLists.txt deleted file mode 100644 index 653ea711..00000000 --- a/src/supplemental/base64/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> -# -# This software is supplied under the terms of the MIT License, a -# copy of which should be located in the distribution where this -# file was obtained (LICENSE.txt). A copy of the license may also be -# found online at https://opensource.org/licenses/MIT. -# - -nng_sources_if(NNG_SUPP_BASE64 - base64.c - base64.h) - -nng_test_if(NNG_SUPP_BASE64 - base64_test) diff --git a/src/supplemental/websocket/CMakeLists.txt b/src/supplemental/websocket/CMakeLists.txt index 5d2f4b0c..37273c27 100644 --- a/src/supplemental/websocket/CMakeLists.txt +++ b/src/supplemental/websocket/CMakeLists.txt @@ -9,8 +9,9 @@ # if (NNG_SUPP_WEBSOCKET) - nng_sources(sha1.c sha1.h websocket.c websocket.h) + nng_sources(base64.c base64.h sha1.c sha1.h websocket.c websocket.h) nng_test(sha1_test) + nng_test(base64_test) else () nng_sources(stub.c) endif () diff --git a/src/supplemental/base64/base64.c b/src/supplemental/websocket/base64.c index 3c19ad8a..3c19ad8a 100644 --- a/src/supplemental/base64/base64.c +++ b/src/supplemental/websocket/base64.c diff --git a/src/supplemental/base64/base64.h b/src/supplemental/websocket/base64.h index 97ca8968..97ca8968 100644 --- a/src/supplemental/base64/base64.h +++ b/src/supplemental/websocket/base64.h diff --git a/src/supplemental/base64/base64_test.c b/src/supplemental/websocket/base64_test.c index ae8df8e6..ae8df8e6 100644 --- a/src/supplemental/base64/base64_test.c +++ b/src/supplemental/websocket/base64_test.c diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 9cb1a677..84d3fd72 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -16,8 +16,7 @@ #include "core/nng_impl.h" #include "supplemental/http/http_api.h" -#include "supplemental/base64/base64.h" - +#include "base64.h" #include "sha1.h" #include "websocket.h" |