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

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

5 files changed, 2 insertions, 30 deletions

diff --git a/src/s2k/info.txt b/src/s2k/info.txt
index 17f2a8c42..1d5226524 100644
--- a/src/s2k/info.txt
+++ b/src/s2k/info.txt
@@ -1,10 +1,3 @@
-load_on auto
-
-<add>
-s2k.cpp
-s2k.h
-</add>
-
 <requires>
 rng
 sym_algo
diff --git a/src/s2k/pbkdf1/info.txt b/src/s2k/pbkdf1/info.txt
index 387043f1b..e51b44886 100644
--- a/src/s2k/pbkdf1/info.txt
+++ b/src/s2k/pbkdf1/info.txt
@@ -1,12 +1,5 @@
 define PBKDF1
 
-load_on auto
-
-<add>
-pbkdf1.cpp
-pbkdf1.h
-</add>
-
 <requires>
 hash
 </requires>
diff --git a/src/s2k/pbkdf2/info.txt b/src/s2k/pbkdf2/info.txt
index 56359d13d..5462b2e1b 100644
--- a/src/s2k/pbkdf2/info.txt
+++ b/src/s2k/pbkdf2/info.txt
@@ -1,12 +1,5 @@
 define PBKDF2
 
-load_on auto
-
-<add>
-pbkdf2.cpp
-pbkdf2.h
-</add>
-
 <requires>
 mac
 </requires>
diff --git a/src/s2k/pbkdf2/pbkdf2.cpp b/src/s2k/pbkdf2/pbkdf2.cpp
index 1de27c9ac..4fc1b8deb 100644
--- a/src/s2k/pbkdf2/pbkdf2.cpp
+++ b/src/s2k/pbkdf2/pbkdf2.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/pbkdf2.h>
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/xor_buf.h>
 
 namespace Botan {
 
diff --git a/src/s2k/pgps2k/info.txt b/src/s2k/pgps2k/info.txt
index a1f5b3dfd..8be9c79f8 100644
--- a/src/s2k/pgps2k/info.txt
+++ b/src/s2k/pgps2k/info.txt
@@ -1,12 +1,5 @@
 define PGPS2K
 
-load_on auto
-
-<add>
-pgp_s2k.cpp
-pgp_s2k.h
-</add>
-
 <requires>
 hash
 </requires>