aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2008-09-30 04:46:32 +0000
committerlloyd <lloyd@randombit.net>2008-09-30 04:46:32 +0000
commit42e3fe73cb63fe92510964d60bfccded65d08c36 (patch)
treefb77293dfc71b386da6da4fe0f92676b53afc02b
parentbd2abf83b8ae1b93f2c8e1875873c1cab9c1e18e (diff)
Move allocator base code into core/, alloc_mmap to alloc/
-rw-r--r--src/alloc/alloc_mmap/info.txt (renamed from src/secalloc/alloc_mmap/info.txt)0
-rw-r--r--src/alloc/alloc_mmap/mmap_mem.cpp (renamed from src/secalloc/alloc_mmap/mmap_mem.cpp)0
-rw-r--r--src/alloc/alloc_mmap/mmap_mem.h (renamed from src/secalloc/alloc_mmap/mmap_mem.h)0
-rw-r--r--src/core/allocate.h (renamed from src/secalloc/allocators/allocate.h)0
-rw-r--r--src/core/defalloc.cpp (renamed from src/secalloc/allocators/defalloc.cpp)0
-rw-r--r--src/core/defalloc.h (renamed from src/secalloc/allocators/defalloc.h)0
-rw-r--r--src/core/info.txt9
-rw-r--r--src/core/libstate/info.txt14
-rw-r--r--src/core/mem_pool.cpp (renamed from src/secalloc/allocators/mem_pool.cpp)0
-rw-r--r--src/core/mem_pool.h (renamed from src/secalloc/allocators/mem_pool.h)0
-rw-r--r--src/core/secmem.h (renamed from src/secalloc/allocators/secmem.h)0
-rw-r--r--src/secalloc/allocators/info.txt14
12 files changed, 14 insertions, 23 deletions
diff --git a/src/secalloc/alloc_mmap/info.txt b/src/alloc/alloc_mmap/info.txt
index 8cc2b206e..8cc2b206e 100644
--- a/src/secalloc/alloc_mmap/info.txt
+++ b/src/alloc/alloc_mmap/info.txt
diff --git a/src/secalloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
index e9ea17a53..e9ea17a53 100644
--- a/src/secalloc/alloc_mmap/mmap_mem.cpp
+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
diff --git a/src/secalloc/alloc_mmap/mmap_mem.h b/src/alloc/alloc_mmap/mmap_mem.h
index 740aa9ec6..740aa9ec6 100644
--- a/src/secalloc/alloc_mmap/mmap_mem.h
+++ b/src/alloc/alloc_mmap/mmap_mem.h
diff --git a/src/secalloc/allocators/allocate.h b/src/core/allocate.h
index efbb77291..efbb77291 100644
--- a/src/secalloc/allocators/allocate.h
+++ b/src/core/allocate.h
diff --git a/src/secalloc/allocators/defalloc.cpp b/src/core/defalloc.cpp
index 5fb8e1447..5fb8e1447 100644
--- a/src/secalloc/allocators/defalloc.cpp
+++ b/src/core/defalloc.cpp
diff --git a/src/secalloc/allocators/defalloc.h b/src/core/defalloc.h
index dc01ee47f..dc01ee47f 100644
--- a/src/secalloc/allocators/defalloc.h
+++ b/src/core/defalloc.h
diff --git a/src/core/info.txt b/src/core/info.txt
index fabf676f3..9331d56dd 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -9,27 +9,29 @@ aes
sha1
sha2
hmac
-allocators
filters
libstate
timer_base
</requires>
<add>
+allocate.h
base.cpp
base.h
botan.h
data_src.cpp
data_src.h
def_powm.cpp
+defalloc.cpp
+defalloc.h
eng_def.h
enums.h
exceptn.cpp
exceptn.h
kdf.cpp
kdf.h
-modules.cpp
-modules.h
+mem_pool.cpp
+mem_pool.h
mutex.h
pk_pad.cpp
pk_pad.h
@@ -37,6 +39,7 @@ rng.cpp
rng.h
s2k.cpp
s2k.h
+secmem.h
symkey.cpp
symkey.h
</add>
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
index f0040a688..89bb3a462 100644
--- a/src/core/libstate/info.txt
+++ b/src/core/libstate/info.txt
@@ -14,21 +14,23 @@ def_alg.cpp
def_mode.cpp
eng_base.cpp
engine.cpp
+engine.h
get_enc.cpp
get_pbe.cpp
+get_pbe.h
init.h
init_def.cpp
init_opt.cpp
libstate.cpp
-look_pk.cpp
-lookup.cpp
-oids.cpp
-policy.cpp
-engine.h
-get_pbe.h
libstate.h
look_add.h
+look_pk.cpp
look_pk.h
+lookup.cpp
lookup.h
+modules.cpp
+modules.h
+oids.cpp
oids.h
+policy.cpp
</add>
diff --git a/src/secalloc/allocators/mem_pool.cpp b/src/core/mem_pool.cpp
index c99d627ad..c99d627ad 100644
--- a/src/secalloc/allocators/mem_pool.cpp
+++ b/src/core/mem_pool.cpp
diff --git a/src/secalloc/allocators/mem_pool.h b/src/core/mem_pool.h
index b74e08a8d..b74e08a8d 100644
--- a/src/secalloc/allocators/mem_pool.h
+++ b/src/core/mem_pool.h
diff --git a/src/secalloc/allocators/secmem.h b/src/core/secmem.h
index 37adf7f42..37adf7f42 100644
--- a/src/secalloc/allocators/secmem.h
+++ b/src/core/secmem.h
diff --git a/src/secalloc/allocators/info.txt b/src/secalloc/allocators/info.txt
deleted file mode 100644
index e2d8d2a16..000000000
--- a/src/secalloc/allocators/info.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-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>