propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)

            to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)

23 files changed, 38 insertions, 153 deletions

diff --git a/src/pubkey/dh/dh_core.cpp b/src/pubkey/dh/dh_core.cpp
index 78a26a8ef..07d134c44 100644
--- a/src/pubkey/dh/dh_core.cpp
+++ b/src/pubkey/dh/dh_core.cpp
@@ -13,18 +13,14 @@
 
 namespace Botan {
 
-namespace {
-
-const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
-
-}
-
 /*
 * DH_Core Constructor
 */
 DH_Core::DH_Core(RandomNumberGenerator& rng,
                  const DL_Group& group, const BigInt& x)
    {
+   const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
+
    op = Engine_Core::dh_op(group, x);
 
    const BigInt& p = group.get_p();
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 8295a74f4..ca8f74fa1 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -1,14 +1,15 @@
 define DIFFIE_HELLMAN
 
-load_on auto
+<header:public>
+dh_core.h
+dh_op.h
+dh.h
+</header:public>
 
-<add>
+<source>
 dh.cpp
-dh.h
 dh_core.cpp
-dh_core.h
-dh_op.h
-</add>
+</source>
 
 <requires>
 dl_algo
diff --git a/src/pubkey/dl_algo/info.txt b/src/pubkey/dl_algo/info.txt
index 0ac91c887..21829fa42 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/src/pubkey/dl_algo/info.txt
@@ -1,12 +1,5 @@
 define DL_PUBLIC_KEY_FAMILY
 
-load_on auto
-
-<add>
-dl_algo.cpp
-dl_algo.h
-</add>
-
 <requires>
 asn1
 dl_group
diff --git a/src/pubkey/dl_group/info.txt b/src/pubkey/dl_group/info.txt
index 2e5273ac4..8922be3fb 100644
--- a/src/pubkey/dl_group/info.txt
+++ b/src/pubkey/dl_group/info.txt
@@ -1,12 +1,5 @@
-load_on auto
-
 define DL_GROUP
 
-<add>
-dl_group.cpp
-dl_group.h
-</add>
-
 <requires>
 asn1
 bigint
diff --git a/src/pubkey/dlies/dlies.cpp b/src/pubkey/dlies/dlies.cpp
index 0f5d76726..3a3ab52ee 100644
--- a/src/pubkey/dlies/dlies.cpp
+++ b/src/pubkey/dlies/dlies.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dlies.h>
 #include <botan/look_pk.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index d3e950427..5aa90f646 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -1,12 +1,5 @@
 define DLIES
 
-load_on auto
-
-<add>
-dlies.cpp
-dlies.h
-</add>
-
 <requires>
 kdf
 libstate
diff --git a/src/pubkey/dsa/info.txt b/src/pubkey/dsa/info.txt
index 776a5da28..1248cf68d 100644
--- a/src/pubkey/dsa/info.txt
+++ b/src/pubkey/dsa/info.txt
@@ -1,15 +1,16 @@
 define DSA
 
-load_on auto
+<header:public>
+dsa.h
+dsa_core.h
+dsa_op.h
+</header:public>
 
-<add>
+<source>
 dsa.cpp
-dsa.h
 dsa_core.cpp
-dsa_core.h
 dsa_op.cpp
-dsa_op.h
-</add>
+</source>
 
 <requires>
 dl_algo
diff --git a/src/pubkey/ec_dompar/ec_dompar.h b/src/pubkey/ec_dompar/ec_dompar.h
index 5ea599c9d..5f03f1c5f 100644
--- a/src/pubkey/ec_dompar/ec_dompar.h
+++ b/src/pubkey/ec_dompar/ec_dompar.h
@@ -92,7 +92,8 @@ class BOTAN_DLL EC_Domain_Params
       std::string m_oid;
    };
 
-bool operator==(EC_Domain_Params const& lhs, EC_Domain_Params const& rhs);
+bool BOTAN_DLL operator==(EC_Domain_Params const& lhs,
+                          EC_Domain_Params const& rhs);
 
 inline bool operator!=(const EC_Domain_Params& lhs,
                        const EC_Domain_Params& rhs)
@@ -102,10 +103,12 @@ inline bool operator!=(const EC_Domain_Params& lhs,
 
 enum EC_dompar_enc { ENC_EXPLICIT = 0, ENC_IMPLICITCA = 1, ENC_OID = 2 };
 
-SecureVector<byte> encode_der_ec_dompar(EC_Domain_Params const& dom_pars,
-                                        EC_dompar_enc enc_type);
+SecureVector<byte>
+BOTAN_DLL encode_der_ec_dompar(EC_Domain_Params const& dom_pars,
+                               EC_dompar_enc enc_type);
 
-EC_Domain_Params decode_ber_ec_dompar(SecureVector<byte> const& encoded);
+EC_Domain_Params
+BOTAN_DLL decode_ber_ec_dompar(SecureVector<byte> const& encoded);
 
 /**
 * Factory function, the only way to obtain EC domain parameters with
@@ -115,7 +118,7 @@ EC_Domain_Params decode_ber_ec_dompar(SecureVector<byte> const& encoded);
 * @param oid the oid of the demanded EC domain parameters
 * @result the EC domain parameters associated with the OID
 */
-EC_Domain_Params get_EC_Dom_Pars_by_oid(std::string oid);
+EC_Domain_Params BOTAN_DLL get_EC_Dom_Pars_by_oid(std::string oid);
 
 }
 
diff --git a/src/pubkey/ec_dompar/info.txt b/src/pubkey/ec_dompar/info.txt
index f32e4fc2f..b05903b69 100644
--- a/src/pubkey/ec_dompar/info.txt
+++ b/src/pubkey/ec_dompar/info.txt
@@ -1,12 +1,5 @@
 define ECC_DOMAIN_PARAMATERS
 
-load_on auto
-
-<add>
-ec_dompar.cpp
-ec_dompar.h
-</add>
-
 <requires>
 asn1
 bigint
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index f45533129..92455189a 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -1,12 +1,5 @@
 define ECC_PUBLIC_KEY_CRYPTO
 
-load_on auto
-
-<add>
-ecc_key.cpp
-ecc_key.h
-</add>
-
 <requires>
 alloc
 asn1
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index 3da73dd34..be5ac037a 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -1,16 +1,5 @@
 define ECDSA
 
-load_on auto
-
-<add>
-ecdsa.cpp
-ecdsa.h
-ecdsa_core.cpp
-ecdsa_core.h
-ecdsa_op.cpp
-ecdsa_op.h
-</add>
-
 <requires>
 alloc
 asn1
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index 3a9768df1..53a744daa 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -1,16 +1,5 @@
 define ECKAEG
 
-load_on auto
-
-<add>
-eckaeg.cpp
-eckaeg.h
-eckaeg_core.cpp
-eckaeg_core.h
-eckaeg_op.cpp
-eckaeg_op.h
-</add>
-
 <requires>
 alloc
 asn1
diff --git a/src/pubkey/elgamal/elg_core.cpp b/src/pubkey/elgamal/elg_core.cpp
index 8b8c8f50b..f2416d8a0 100644
--- a/src/pubkey/elgamal/elg_core.cpp
+++ b/src/pubkey/elgamal/elg_core.cpp
@@ -13,12 +13,6 @@
 
 namespace Botan {
 
-namespace {
-
-const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
-
-}
-
 /*
 * ELG_Core Constructor
 */
@@ -34,6 +28,8 @@ ELG_Core::ELG_Core(const DL_Group& group, const BigInt& y)
 ELG_Core::ELG_Core(RandomNumberGenerator& rng,
                    const DL_Group& group, const BigInt& y, const BigInt& x)
    {
+   const u32bit BLINDING_BITS = BOTAN_PRIVATE_KEY_OP_BLINDING_BITS;
+
    op = Engine_Core::elg_op(group, y, x);
 
    const BigInt& p = group.get_p();
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index 8c55eb909..7906d0cd0 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -1,16 +1,5 @@
 define ELGAMAL
 
-load_on auto
-
-<add>
-elgamal.cpp
-elgamal.h
-elg_core.cpp
-elg_core.h
-elg_op.cpp
-elg_op.h
-</add>
-
 <requires>
 dl_algo
 dl_group
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
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index ea6b4cb9b..69e743351 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -1,7 +1,5 @@
 define PUBLIC_KEY_CRYPTO
 
-load_on auto
-
 <requires>
 alloc
 asn1
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index 360d317c5..c6bf758cc 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -1,12 +1,5 @@
 define KEYPAIR_TESTING
 
-load_on auto
-
-<add>
-keypair.cpp
-keypair.h
-</add>
-
 <requires>
 libstate
 </requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index dcf22033e..c0886ac07 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -1,16 +1,5 @@
 define NYBERG_RUEPPEL
 
-load_on auto
-
-<add>
-nr.cpp
-nr.h
-nr_core.cpp
-nr_core.h
-nr_op.cpp
-nr_op.h
-</add>
-
 <requires>
 dl_algo
 dl_group
diff --git a/src/pubkey/pk_codecs/info.txt b/src/pubkey/pk_codecs/info.txt
index 55c71b0c9..64fb10b8a 100644
--- a/src/pubkey/pk_codecs/info.txt
+++ b/src/pubkey/pk_codecs/info.txt
@@ -1,12 +1,3 @@
-load_on auto
-
-<add>
-pkcs8.h
-pkcs8.cpp
-x509_key.h
-x509_key.cpp
-</add>
-
 <requires>
 asn1
 filters
diff --git a/src/pubkey/pubkey.cpp b/src/pubkey/pubkey.cpp
index 5a5ca335e..a6e424e05 100644
--- a/src/pubkey/pubkey.cpp
+++ b/src/pubkey/pubkey.cpp
@@ -10,7 +10,7 @@
 #include <botan/ber_dec.h>
 #include <botan/bigint.h>
 #include <botan/parsing.h>
-#include <botan/bit_ops.h>
+#include <botan/internal/bit_ops.h>
 #include <memory>
 
 namespace Botan {
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index c8bde68d0..877d092b6 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -1,12 +1,5 @@
 define RSA
 
-load_on auto
-
-<add>
-rsa.cpp
-rsa.h
-</add>
-
 <requires>
 if_algo
 keypair
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 39857bccc..cb3e5531c 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -1,12 +1,5 @@
 define RW
 
-load_on auto
-
-<add>
-rw.cpp
-rw.h
-</add>
-
 <requires>
 if_algo
 keypair