aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/compat
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2020-11-05 03:47:06 -0500
committerJack Lloyd <[email protected]>2020-11-06 11:31:22 -0500
commita55e4b22b6cbeeb30ca787d4ea4e3933ccccbdf1 (patch)
tree3d066440f30d30a46179caded3f1273d06a4dd95 /src/lib/compat
parent7c27982e27b953682554de3c4b22843e0e7461e7 (diff)
Remove deprecated headers, make more headers internal
Now modules default to internal headers instead of defaulting to public; making a new public API should be a visible and intentional choice. Brings the public header count from over 300 to around 150. Also removes the deprecated tls_blocking interface
Diffstat (limited to 'src/lib/compat')
-rw-r--r--src/lib/compat/sodium/info.txt4
-rw-r--r--src/lib/compat/sodium/sodium_salsa.cpp4
-rw-r--r--src/lib/compat/sodium/sodium_utils.cpp4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/compat/sodium/info.txt b/src/lib/compat/sodium/info.txt
index 4adc853d9..0171ca376 100644
--- a/src/lib/compat/sodium/info.txt
+++ b/src/lib/compat/sodium/info.txt
@@ -15,3 +15,7 @@ hmac
siphash
system_rng
</requires>
+
+<header:public>
+sodium.h
+</header:public>
diff --git a/src/lib/compat/sodium/sodium_salsa.cpp b/src/lib/compat/sodium/sodium_salsa.cpp
index c1465a9bb..1f26f55ff 100644
--- a/src/lib/compat/sodium/sodium_salsa.cpp
+++ b/src/lib/compat/sodium/sodium_salsa.cpp
@@ -5,8 +5,8 @@
*/
#include <botan/sodium.h>
-#include <botan/salsa20.h>
-#include <botan/loadstor.h>
+#include <botan/internal/salsa20.h>
+#include <botan/internal/loadstor.h>
namespace Botan {
diff --git a/src/lib/compat/sodium/sodium_utils.cpp b/src/lib/compat/sodium/sodium_utils.cpp
index 3f0a6c84e..56fe98696 100644
--- a/src/lib/compat/sodium/sodium_utils.cpp
+++ b/src/lib/compat/sodium/sodium_utils.cpp
@@ -5,12 +5,12 @@
*/
#include <botan/sodium.h>
-#include <botan/chacha.h>
+#include <botan/internal/chacha.h>
#include <botan/mem_ops.h>
#include <botan/system_rng.h>
#include <botan/internal/os_utils.h>
#include <botan/internal/ct_utils.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
namespace Botan {