Full working amalgamation build, plus internal-only headers concept.

7 files changed, 10 insertions, 12 deletions

diff --git a/src/hash/has160/has160.cpp b/src/hash/has160/has160.cpp
index ae45418ce..d245a0249 100644
--- a/src/hash/has160/has160.cpp
+++ b/src/hash/has160/has160.cpp
@@ -11,7 +11,7 @@
 
 namespace Botan {
 
-namespace {
+namespace HAS_160_F {
 
 /*
 * HAS-160 F1 Function
@@ -60,6 +60,8 @@ inline void F4(u32bit A, u32bit& B, u32bit C, u32bit D, u32bit& E,
 */
 void HAS_160::compress_n(const byte input[], u32bit blocks)
    {
+   using namespace HAS_160_F;
+
    u32bit A = digest[0], B = digest[1], C = digest[2],
           D = digest[3], E = digest[4];
 
diff --git a/src/hash/info.txt b/src/hash/info.txt
index 0e45806f8..a048df7d9 100644
--- a/src/hash/info.txt
+++ b/src/hash/info.txt
@@ -1,9 +1,3 @@
-load_on auto
-
-<add>
-hash.h
-</add>
-
 <requires>
 buf_comp
 </requires>
diff --git a/src/hash/md4_ia32/md4_ia32_imp.S b/src/hash/md4_ia32/md4_ia32_imp.S
index 1df972bb9..c7e108147 100644
--- a/src/hash/md4_ia32/md4_ia32_imp.S
+++ b/src/hash/md4_ia32/md4_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_ia32.h>
+#include <botan/internal/asm_macr_ia32.h>
 
 START_LISTING(md4_ia32.S)
 
diff --git a/src/hash/md5_ia32/md5_ia32_imp.S b/src/hash/md5_ia32/md5_ia32_imp.S
index d1aecb834..e77836353 100644
--- a/src/hash/md5_ia32/md5_ia32_imp.S
+++ b/src/hash/md5_ia32/md5_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_ia32.h>
+#include <botan/internal/asm_macr_ia32.h>
 
 START_LISTING(md5_ia32.S)
 
diff --git a/src/hash/rmd128/rmd128.cpp b/src/hash/rmd128/rmd128.cpp
index 7e9da3bdd..51e416eb1 100644
--- a/src/hash/rmd128/rmd128.cpp
+++ b/src/hash/rmd128/rmd128.cpp
@@ -11,7 +11,7 @@
 
 namespace Botan {
 
-namespace {
+namespace RIPEMD_128_F {
 
 /*
 * RIPEMD-128 F1 Function
@@ -60,6 +60,8 @@ inline void F4(u32bit& A, u32bit B, u32bit C, u32bit D,
 */
 void RIPEMD_128::compress_n(const byte input[], u32bit blocks)
    {
+   using namespace RIPEMD_128_F;
+
    const u32bit MAGIC2 = 0x5A827999, MAGIC3 = 0x6ED9EBA1,
                 MAGIC4 = 0x8F1BBCDC, MAGIC5 = 0x50A28BE6,
                 MAGIC6 = 0x5C4DD124, MAGIC7 = 0x6D703EF3;
diff --git a/src/hash/sha1_amd64/sha1_amd64_imp.S b/src/hash/sha1_amd64/sha1_amd64_imp.S
index d45e2fd86..4eea75f11 100644
--- a/src/hash/sha1_amd64/sha1_amd64_imp.S
+++ b/src/hash/sha1_amd64/sha1_amd64_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_amd64.h>
+#include <botan/internal/asm_macr_amd64.h>
 
 START_LISTING(sha1_amd64.S)
 
diff --git a/src/hash/sha1_ia32/sha1_ia32_imp.S b/src/hash/sha1_ia32/sha1_ia32_imp.S
index 3167fce9a..c2777b4b5 100644
--- a/src/hash/sha1_ia32/sha1_ia32_imp.S
+++ b/src/hash/sha1_ia32/sha1_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_ia32.h>
+#include <botan/internal/asm_macr_ia32.h>
 
 START_LISTING(sha1_ia32.S)