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

2 files changed, 10 insertions, 11 deletions

diff --git a/src/pubkey/if_algo/if_core.cpp b/src/pubkey/if_algo/if_core.cpp
index 8cc6a816f..9c4a12ee5 100644
--- a/src/pubkey/if_algo/if_core.cpp
+++ b/src/pubkey/if_algo/if_core.cpp
@@ -13,12 +13,6 @@
 
 namespace Botan {
 
-namespace {
-
-const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
-
-}
-
 /*
 * IF_Core Constructor
 */
@@ -36,6 +30,8 @@ IF_Core::IF_Core(RandomNumberGenerator& rng,
                  const BigInt& p, const BigInt& q,
                  const BigInt& d1, const BigInt& d2, const BigInt& c)
    {
+   const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
+
    op = Engine_Core::if_op(e, n, d, p, q, d1, d2, c);
 
    if(BLINDING_BITS)
diff --git a/src/pubkey/if_algo/info.txt b/src/pubkey/if_algo/info.txt
index ec948aec3..833117819 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/src/pubkey/if_algo/info.txt
@@ -2,14 +2,17 @@ define IF_PUBLIC_KEY_FAMILY
 
 load_on dep
 
-<add>
-if_algo.cpp
+<header:public>
 if_algo.h
-if_core.cpp
 if_core.h
-if_op.cpp
 if_op.h
-</add>
+</header:public>
+
+<source>
+if_algo.cpp
+if_core.cpp
+if_op.cpp
+</source>
 
 <requires>
 asn1