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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/pk_pad/hash_id/hash_id.cpp b/src/lib/pk_pad/hash_id/hash_id.cpp
index efebf5095..40e2c4bc5 100644
--- a/src/lib/pk_pad/hash_id/hash_id.cpp
+++ b/src/lib/pk_pad/hash_id/hash_id.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/hash_id.h>
+#include <botan/internal/hash_id.h>
 #include <botan/exceptn.h>
 
 namespace Botan {
diff --git a/src/lib/pk_pad/hash_id/hash_id.h b/src/lib/pk_pad/hash_id/hash_id.h
index 75c86c0c6..b7ef18a39 100644
--- a/src/lib/pk_pad/hash_id/hash_id.h
+++ b/src/lib/pk_pad/hash_id/hash_id.h
@@ -20,14 +20,14 @@ namespace Botan {
 * @return uint8_t sequence identifying the hash
 * @throw Invalid_Argument if the hash has no known PKCS #1 hash id
 */
-BOTAN_PUBLIC_API(2,0) std::vector<uint8_t> pkcs_hash_id(const std::string& hash_name);
+std::vector<uint8_t> BOTAN_TEST_API pkcs_hash_id(const std::string& hash_name);
 
 /**
 * Return the IEEE 1363 hash identifier
 * @param hash_name the name of the hash function
 * @return uint8_t code identifying the hash, or 0 if not known
 */
-BOTAN_PUBLIC_API(2,0) uint8_t ieee1363_hash_id(const std::string& hash_name);
+uint8_t ieee1363_hash_id(const std::string& hash_name);
 
 }