Make many more headers internal-only.

Fixes for the amalgamation generator for internal headers.

Remove BOTAN_DLL exporting macros from all internal-only headers;
the classes/functions there don't need to be exported, and
avoiding the PIC/GOT indirection can be a big win.

Add missing BOTAN_DLLs where necessary, mostly gfpmath and cvc

For GCC, use -fvisibility=hidden and set BOTAN_DLL to the
visibility __attribute__ to export those classes/functions.

10 files changed, 20 insertions, 18 deletions

diff --git a/src/utils/bswap.h b/src/utils/bswap.h
index ec1e81435..3294111a0 100644
--- a/src/utils/bswap.h
+++ b/src/utils/bswap.h
@@ -10,7 +10,7 @@
 #define BOTAN_BYTE_SWAP_H__
 
 #include <botan/types.h>
-#include <botan/rotate.h>
+#include <botan/internal/rotate.h>
 
 namespace Botan {
 
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 2ba7f9b77..a6f40f53c 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/cpuid.h>
 #include <botan/types.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/mem_ops.h>
 
 #if defined(BOTAN_TARGET_ARCH_IS_IA32) || defined(BOTAN_TARGET_ARCH_IS_AMD64)
diff --git a/src/utils/datastor/datastor.cpp b/src/utils/datastor/datastor.cpp
index 129dad9bf..0d808eebd 100644
--- a/src/utils/datastor/datastor.cpp
+++ b/src/utils/datastor/datastor.cpp
@@ -8,7 +8,7 @@
 #include <botan/datastor.h>
 #include <botan/exceptn.h>
 #include <botan/parsing.h>
-#include <botan/stl_util.h>
+#include <botan/internal/stl_util.h>
 #include <botan/filters.h>
 
 namespace Botan {
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 7324f55f6..edeeb1cf9 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -13,23 +13,25 @@ ui.cpp
 version.cpp
 </source>
 
-<header:public>
+<header:internal>
 bit_ops.h
 bswap.h
-charset.h
-cpuid.h
 loadstor.h
 mlock.h
-parsing.h
 prefetch.h
 rotate.h
 rounding.h
 stl_util.h
-time.h
 xor_buf.h
+</header:internal>
 
+<header:public>
+charset.h
+cpuid.h
 exceptn.h
 mem_ops.h
+parsing.h
+time.h
 types.h
 ui.h
 version.h
diff --git a/src/utils/loadstor.h b/src/utils/loadstor.h
index b15cafd2c..fa2e36c1e 100644
--- a/src/utils/loadstor.h
+++ b/src/utils/loadstor.h
@@ -10,9 +10,9 @@
 #define BOTAN_LOAD_STORE_H__
 
 #include <botan/types.h>
-#include <botan/bswap.h>
-#include <botan/rotate.h>
-#include <botan/prefetch.h>
+#include <botan/internal/bswap.h>
+#include <botan/internal/rotate.h>
+#include <botan/internal/prefetch.h>
 #include <cstring>
 
 #if BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK
diff --git a/src/utils/mlock.cpp b/src/utils/mlock.cpp
index 6453d8a30..bb3a38d4e 100644
--- a/src/utils/mlock.cpp
+++ b/src/utils/mlock.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mlock.h>
+#include <botan/internal/mlock.h>
 
 #if defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK)
   #include <sys/types.h>
diff --git a/src/utils/mlock.h b/src/utils/mlock.h
index 0811e8190..66ced9e63 100644
--- a/src/utils/mlock.h
+++ b/src/utils/mlock.h
@@ -18,14 +18,14 @@ namespace Botan {
 * @param length the length of the memory block in bytes
 * @returns true if successful, false otherwise
 */
-BOTAN_DLL bool lock_mem(void* addr, u32bit length);
+bool lock_mem(void* addr, u32bit length);
 
 /**
 * Unlock memory locked with lock_mem()
 * @param addr the start of the memory block
 * @param length the length of the memory block in bytes
 */
-BOTAN_DLL void unlock_mem(void* addr, u32bit length);
+void unlock_mem(void* addr, u32bit length);
 
 }
 
diff --git a/src/utils/parsing.cpp b/src/utils/parsing.cpp
index 58a8e0b38..0ccd8a312 100644
--- a/src/utils/parsing.cpp
+++ b/src/utils/parsing.cpp
@@ -8,7 +8,7 @@
 #include <botan/parsing.h>
 #include <botan/exceptn.h>
 #include <botan/charset.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/utils/simd_32/simd_altivec.h b/src/utils/simd_32/simd_altivec.h
index 9cc5c1068..d24c7e73f 100644
--- a/src/utils/simd_32/simd_altivec.h
+++ b/src/utils/simd_32/simd_altivec.h
@@ -10,7 +10,7 @@
 
 #if defined(BOTAN_TARGET_CPU_HAS_ALTIVEC)
 
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/cpuid.h>
 
 #include <altivec.h>
diff --git a/src/utils/simd_32/simd_scalar.h b/src/utils/simd_32/simd_scalar.h
index 148b76c35..e8e46db44 100644
--- a/src/utils/simd_32/simd_scalar.h
+++ b/src/utils/simd_32/simd_scalar.h
@@ -8,8 +8,8 @@
 #ifndef BOTAN_SIMD_SCALAR_H__
 #define BOTAN_SIMD_SCALAR_H__
 
-#include <botan/loadstor.h>
-#include <botan/bswap.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/bswap.h>
 
 namespace Botan {