From a55e4b22b6cbeeb30ca787d4ea4e3933ccccbdf1 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Thu, 5 Nov 2020 03:47:06 -0500
Subject: 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
---
 src/lib/block/gost_28147/gost_28147.cpp | 6 +++---
 src/lib/block/gost_28147/gost_28147.h   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/lib/block/gost_28147')

diff --git a/src/lib/block/gost_28147/gost_28147.cpp b/src/lib/block/gost_28147/gost_28147.cpp
index 2b8aa031e..12ff7cdf5 100644
--- a/src/lib/block/gost_28147/gost_28147.cpp
+++ b/src/lib/block/gost_28147/gost_28147.cpp
@@ -5,10 +5,10 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/gost_28147.h>
+#include <botan/internal/gost_28147.h>
 #include <botan/exceptn.h>
-#include <botan/loadstor.h>
-#include <botan/rotate.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/rotate.h>
 
 namespace Botan {
 
diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h
index f71bb28bd..e9d11e091 100644
--- a/src/lib/block/gost_28147/gost_28147.h
+++ b/src/lib/block/gost_28147/gost_28147.h
@@ -10,8 +10,6 @@
 
 #include <botan/block_cipher.h>
 
-BOTAN_FUTURE_INTERNAL_HEADER(gost_28147.h)
-
 namespace Botan {
 
 /**
@@ -20,7 +18,7 @@ namespace Botan {
 * considered a local configuration issue. Several different sets are
 * used.
 */
-class BOTAN_PUBLIC_API(2,0) GOST_28147_89_Params final
+class GOST_28147_89_Params final
    {
    public:
       /**
@@ -57,7 +55,7 @@ class BOTAN_PUBLIC_API(2,0) GOST_28147_89_Params final
 /**
 * GOST 28147-89
 */
-class BOTAN_PUBLIC_API(2,0) GOST_28147_89 final : public Block_Cipher_Fixed_Params<8, 32>
+class GOST_28147_89 final : public Block_Cipher_Fixed_Params<8, 32>
    {
    public:
       void encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const override;
-- 
cgit v1.2.3