aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/def_alg.cpp5
-rw-r--r--src/hash/par_hash/modinfo.txt10
-rw-r--r--src/hash/par_hash/par_hash.cpp (renamed from src/par_hash.cpp)0
-rw-r--r--src/hash/par_hash/par_hash.h (renamed from include/par_hash.h)0
-rw-r--r--src/secalloc/allocators/allocate.h (renamed from include/allocate.h)0
-rw-r--r--src/secalloc/allocators/defalloc.cpp (renamed from src/defalloc.cpp)0
-rw-r--r--src/secalloc/allocators/defalloc.h (renamed from include/defalloc.h)0
-rw-r--r--src/secalloc/allocators/mem_pool.cpp (renamed from src/mem_pool.cpp)0
-rw-r--r--src/secalloc/allocators/mem_pool.h (renamed from include/mem_pool.h)0
-rw-r--r--src/secalloc/allocators/modinfo.txt14
-rw-r--r--src/secalloc/allocators/secmem.h (renamed from include/secmem.h)0
11 files changed, 28 insertions, 1 deletions
diff --git a/src/def_alg.cpp b/src/def_alg.cpp
index 7bcc84378..80d3a771f 100644
--- a/src/def_alg.cpp
+++ b/src/def_alg.cpp
@@ -7,7 +7,6 @@
#include <botan/libstate.h>
#include <botan/parsing.h>
-#include <botan/par_hash.h>
#include <botan/mode_pad.h>
#if defined(BOTAN_HAS_AES)
@@ -176,6 +175,10 @@
#include <botan/whrlpool.h>
#endif
+#if defined(BOTAN_HAS_PARALLEL_HASH)
+ #include <botan/par_hash.h>
+#endif
+
#if defined(BOTAN_HAS_CBC_MAC)
#include <botan/cbc_mac.h>
#endif
diff --git a/src/hash/par_hash/modinfo.txt b/src/hash/par_hash/modinfo.txt
new file mode 100644
index 000000000..45716aac8
--- /dev/null
+++ b/src/hash/par_hash/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Parallel Hash"
+
+define PARALLEL_HASH
+
+load_on auto
+
+<add>
+par_hash.cpp
+par_hash.h
+</add>
diff --git a/src/par_hash.cpp b/src/hash/par_hash/par_hash.cpp
index 12786523f..12786523f 100644
--- a/src/par_hash.cpp
+++ b/src/hash/par_hash/par_hash.cpp
diff --git a/include/par_hash.h b/src/hash/par_hash/par_hash.h
index 844a6fb50..844a6fb50 100644
--- a/include/par_hash.h
+++ b/src/hash/par_hash/par_hash.h
diff --git a/include/allocate.h b/src/secalloc/allocators/allocate.h
index efbb77291..efbb77291 100644
--- a/include/allocate.h
+++ b/src/secalloc/allocators/allocate.h
diff --git a/src/defalloc.cpp b/src/secalloc/allocators/defalloc.cpp
index 5fb8e1447..5fb8e1447 100644
--- a/src/defalloc.cpp
+++ b/src/secalloc/allocators/defalloc.cpp
diff --git a/include/defalloc.h b/src/secalloc/allocators/defalloc.h
index f162f5c71..f162f5c71 100644
--- a/include/defalloc.h
+++ b/src/secalloc/allocators/defalloc.h
diff --git a/src/mem_pool.cpp b/src/secalloc/allocators/mem_pool.cpp
index 74d09d5df..74d09d5df 100644
--- a/src/mem_pool.cpp
+++ b/src/secalloc/allocators/mem_pool.cpp
diff --git a/include/mem_pool.h b/src/secalloc/allocators/mem_pool.h
index 3d28034e7..3d28034e7 100644
--- a/include/mem_pool.h
+++ b/src/secalloc/allocators/mem_pool.h
diff --git a/src/secalloc/allocators/modinfo.txt b/src/secalloc/allocators/modinfo.txt
new file mode 100644
index 000000000..e2d8d2a16
--- /dev/null
+++ b/src/secalloc/allocators/modinfo.txt
@@ -0,0 +1,14 @@
+realname "Secure Memory Allocation"
+
+load_on auto
+
+define SECMEM
+
+<add>
+defalloc.cpp
+mem_pool.cpp
+allocate.h
+defalloc.h
+mem_pool.h
+secmem.h
+</add>
diff --git a/include/secmem.h b/src/secalloc/allocators/secmem.h
index 37adf7f42..37adf7f42 100644
--- a/include/secmem.h
+++ b/src/secalloc/allocators/secmem.h