Merge GH #2728 Clean up visibility issues

4 files changed, 31 insertions, 31 deletions

diff --git a/src/lib/math/numbertheory/monty.h b/src/lib/math/numbertheory/monty.h
index b4c90397e..0f2556df9 100644
--- a/src/lib/math/numbertheory/monty.h
+++ b/src/lib/math/numbertheory/monty.h
@@ -25,7 +25,7 @@ word monty_inverse(word input);
 /**
 * The Montgomery representation of an integer
 */
-class BOTAN_UNSTABLE_API Montgomery_Int final
+class BOTAN_TEST_API Montgomery_Int final
    {
    public:
       /**
@@ -133,7 +133,7 @@ class BOTAN_UNSTABLE_API Montgomery_Int final
 /**
 * Parameters for Montgomery Reduction
 */
-class BOTAN_UNSTABLE_API Montgomery_Params final
+class BOTAN_TEST_API Montgomery_Params final
    {
    public:
       /**
diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h
index 9e85091b9..8d501b13a 100644
--- a/src/lib/utils/cpuid/cpuid.h
+++ b/src/lib/utils/cpuid/cpuid.h
@@ -33,7 +33,7 @@ namespace Botan {
 *    thread-unsafe mechanism involving executing probe functions which
 *    catching SIGILL signal is used.
 */
-class BOTAN_PUBLIC_API(2,1) CPUID final
+class BOTAN_TEST_API CPUID final
    {
    public:
       /**
diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h
index 2a4e4955c..abbed085e 100644
--- a/src/lib/utils/http_util/http_util.h
+++ b/src/lib/utils/http_util/http_util.h
@@ -23,7 +23,7 @@ namespace HTTP {
 /**
 * HTTP_Error Exception
 */
-class BOTAN_PUBLIC_API(2,0) HTTP_Error final : public Exception
+class HTTP_Error final : public Exception
    {
    public:
       explicit HTTP_Error(const std::string& msg) :
@@ -68,35 +68,35 @@ class Response final
       std::map<std::string, std::string> m_headers;
    };
 
-BOTAN_PUBLIC_API(2,0) std::ostream& operator<<(std::ostream& o, const Response& resp);
+BOTAN_TEST_API std::ostream& operator<<(std::ostream& o, const Response& resp);
 
 typedef std::function<std::string (const std::string&, const std::string&, const std::string&)> http_exch_fn;
 
-BOTAN_PUBLIC_API(2,0) Response http_sync(http_exch_fn fn,
-                                         const std::string& verb,
-                                         const std::string& url,
-                                         const std::string& content_type,
-                                         const std::vector<uint8_t>& body,
-                                         size_t allowable_redirects);
-
-BOTAN_PUBLIC_API(2,0) Response http_sync(const std::string& verb,
-                                         const std::string& url,
-                                         const std::string& content_type,
-                                         const std::vector<uint8_t>& body,
-                                         size_t allowable_redirects,
-                                         std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
-
-BOTAN_PUBLIC_API(2,0) Response GET_sync(const std::string& url,
-                                        size_t allowable_redirects = 1,
-                                        std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
-
-BOTAN_PUBLIC_API(2,0) Response POST_sync(const std::string& url,
-                                         const std::string& content_type,
-                                         const std::vector<uint8_t>& body,
-                                         size_t allowable_redirects = 1,
-                                         std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
-
-BOTAN_PUBLIC_API(2,0) std::string url_encode(const std::string& url);
+Response http_sync(http_exch_fn fn,
+                   const std::string& verb,
+                   const std::string& url,
+                   const std::string& content_type,
+                   const std::vector<uint8_t>& body,
+                   size_t allowable_redirects);
+
+Response http_sync(const std::string& verb,
+                   const std::string& url,
+                   const std::string& content_type,
+                   const std::vector<uint8_t>& body,
+                   size_t allowable_redirects,
+                   std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
+
+Response BOTAN_TEST_API GET_sync(const std::string& url,
+                                 size_t allowable_redirects = 1,
+                                 std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
+
+Response POST_sync(const std::string& url,
+                   const std::string& content_type,
+                   const std::vector<uint8_t>& body,
+                   size_t allowable_redirects = 1,
+                   std::chrono::milliseconds timeout = std::chrono::milliseconds(3000));
+
+std::string url_encode(const std::string& url);
 
 }
 
diff --git a/src/lib/utils/scan_name.h b/src/lib/utils/scan_name.h
index ca72eec37..f1868c6da 100644
--- a/src/lib/utils/scan_name.h
+++ b/src/lib/utils/scan_name.h
@@ -18,7 +18,7 @@ namespace Botan {
 A class encapsulating a SCAN name (similar to JCE conventions)
 http://www.users.zetnet.co.uk/hopwood/crypto/scan/
 */
-class BOTAN_PUBLIC_API(2,0) SCAN_Name final
+class SCAN_Name final
    {
    public:
       /**