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

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

11 files changed, 5 insertions, 55 deletions

diff --git a/src/kdf/info.txt b/src/kdf/info.txt
index 8eb4fc6e9..a4cd72bf5 100644
--- a/src/kdf/info.txt
+++ b/src/kdf/info.txt
@@ -1,12 +1,5 @@
 define KDF_BASE
 
-load_on auto
-
-<add>
-kdf.cpp
-kdf.h
-</add>
-
 <requires>
 alloc
 </requires>
diff --git a/src/kdf/kdf1/info.txt b/src/kdf/kdf1/info.txt
index 2557f9472..354466107 100644
--- a/src/kdf/kdf1/info.txt
+++ b/src/kdf/kdf1/info.txt
@@ -1,12 +1,5 @@
 define KDF1
 
-load_on auto
-
-<add>
-kdf1.h
-kdf1.cpp
-</add>
-
 <requires>
 hash
 </requires>
diff --git a/src/kdf/kdf2/info.txt b/src/kdf/kdf2/info.txt
index b71595449..d233b5f77 100644
--- a/src/kdf/kdf2/info.txt
+++ b/src/kdf/kdf2/info.txt
@@ -1,12 +1,5 @@
 define KDF2
 
-load_on auto
-
-<add>
-kdf2.cpp
-kdf2.h
-</add>
-
 <requires>
 hash
 </requires>
diff --git a/src/kdf/kdf2/kdf2.cpp b/src/kdf/kdf2/kdf2.cpp
index 167f64436..f8f178c80 100644
--- a/src/kdf/kdf2/kdf2.cpp
+++ b/src/kdf/kdf2/kdf2.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/kdf2.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/kdf/mgf1/info.txt b/src/kdf/mgf1/info.txt
index 0f104c3b3..91973a614 100644
--- a/src/kdf/mgf1/info.txt
+++ b/src/kdf/mgf1/info.txt
@@ -1,12 +1,5 @@
 define MGF1
 
-load_on dep
-
-<add>
-mgf1.h
-mgf1.cpp
-</add>
-
 <requires>
 hash
 </requires>
diff --git a/src/kdf/mgf1/mgf1.cpp b/src/kdf/mgf1/mgf1.cpp
index a26e33a9e..c61f583a7 100644
--- a/src/kdf/mgf1/mgf1.cpp
+++ b/src/kdf/mgf1/mgf1.cpp
@@ -6,9 +6,9 @@
 */
 
 #include <botan/mgf1.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/exceptn.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 #include <algorithm>
 #include <memory>
 
diff --git a/src/kdf/ssl_prf/info.txt b/src/kdf/ssl_prf/info.txt
index b306721b9..68355ff40 100644
--- a/src/kdf/ssl_prf/info.txt
+++ b/src/kdf/ssl_prf/info.txt
@@ -1,12 +1,5 @@
 define SSL_V3_PRF
 
-load_on auto
-
-<add>
-prf_ssl3.h
-prf_ssl3.cpp
-</add>
-
 <requires>
 md5
 sha1
diff --git a/src/kdf/tls_prf/info.txt b/src/kdf/tls_prf/info.txt
index 11a0d44f5..9531a6a83 100644
--- a/src/kdf/tls_prf/info.txt
+++ b/src/kdf/tls_prf/info.txt
@@ -1,15 +1,7 @@
 define TLS_V10_PRF
 
-load_on auto
-
-<add>
-prf_tls.h
-prf_tls.cpp
-</add>
-
 <requires>
 hmac
-mac
 md5
 sha1
 </requires>
diff --git a/src/kdf/tls_prf/prf_tls.cpp b/src/kdf/tls_prf/prf_tls.cpp
index 7c638b994..5e77f831e 100644
--- a/src/kdf/tls_prf/prf_tls.cpp
+++ b/src/kdf/tls_prf/prf_tls.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/prf_tls.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/xor_buf.h>
 #include <botan/hmac.h>
 #include <botan/md5.h>
 #include <botan/sha160.h>
diff --git a/src/kdf/x942_prf/info.txt b/src/kdf/x942_prf/info.txt
index e38b2aac1..e51aafd08 100644
--- a/src/kdf/x942_prf/info.txt
+++ b/src/kdf/x942_prf/info.txt
@@ -1,12 +1,5 @@
 define X942_PRF
 
-load_on auto
-
-<add>
-prf_x942.cpp
-prf_x942.h
-</add>
-
 <requires>
 asn1
 oid_lookup
diff --git a/src/kdf/x942_prf/prf_x942.cpp b/src/kdf/x942_prf/prf_x942.cpp
index d9ee09d20..060fed700 100644
--- a/src/kdf/x942_prf/prf_x942.cpp
+++ b/src/kdf/x942_prf/prf_x942.cpp
@@ -9,7 +9,7 @@
 #include <botan/der_enc.h>
 #include <botan/oids.h>
 #include <botan/sha160.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <algorithm>
 #include <memory>