aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/passhash
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/passhash
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/passhash')
-rw-r--r--src/lib/passhash/bcrypt/bcrypt.cpp4
-rw-r--r--src/lib/passhash/bcrypt/info.txt4
-rw-r--r--src/lib/passhash/passhash9/info.txt4
-rw-r--r--src/lib/passhash/passhash9/passhash9.cpp2
4 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/passhash/bcrypt/bcrypt.cpp b/src/lib/passhash/bcrypt/bcrypt.cpp
index 1d28ddfb4..0b53fe42c 100644
--- a/src/lib/passhash/bcrypt/bcrypt.cpp
+++ b/src/lib/passhash/bcrypt/bcrypt.cpp
@@ -7,9 +7,9 @@
#include <botan/bcrypt.h>
#include <botan/rng.h>
-#include <botan/blowfish.h>
+#include <botan/internal/blowfish.h>
#include <botan/base64.h>
-#include <botan/parsing.h>
+#include <botan/internal/parsing.h>
namespace Botan {
diff --git a/src/lib/passhash/bcrypt/info.txt b/src/lib/passhash/bcrypt/info.txt
index 6be060ea0..9bdb62539 100644
--- a/src/lib/passhash/bcrypt/info.txt
+++ b/src/lib/passhash/bcrypt/info.txt
@@ -7,3 +7,7 @@ blowfish
rng
base64
</requires>
+
+<header:public>
+bcrypt.h
+</header:public>
diff --git a/src/lib/passhash/passhash9/info.txt b/src/lib/passhash/passhash9/info.txt
index 525427b45..a9ccd4356 100644
--- a/src/lib/passhash/passhash9/info.txt
+++ b/src/lib/passhash/passhash9/info.txt
@@ -7,3 +7,7 @@ pbkdf2
rng
base64
</requires>
+
+<header:public>
+passhash9.h
+</header:public>
diff --git a/src/lib/passhash/passhash9/passhash9.cpp b/src/lib/passhash/passhash9/passhash9.cpp
index 98f5a54d5..337fad1fe 100644
--- a/src/lib/passhash/passhash9/passhash9.cpp
+++ b/src/lib/passhash/passhash9/passhash9.cpp
@@ -7,7 +7,7 @@
#include <botan/passhash9.h>
#include <botan/rng.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
#include <botan/pbkdf2.h>
#include <botan/base64.h>