aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-10-01 15:55:40 +0000
committerlloyd <[email protected]>2008-10-01 15:55:40 +0000
commit514c4e35119eca7132ca9ab38cc0de2b701da492 (patch)
tree62d8a216e3e548aa04cc78b7d70010854a0dc29f /src
parent97b4b23a88c27bc154a3751e8e99cd75b7ea8e84 (diff)
Move get_pbe from libstate to new pbe_base module (in pbe/)
Diffstat (limited to 'src')
-rw-r--r--src/core/libstate/info.txt2
-rw-r--r--src/pbe/pbe_base/get_pbe.cpp (renamed from src/core/libstate/get_pbe.cpp)0
-rw-r--r--src/pbe/pbe_base/get_pbe.h (renamed from src/core/libstate/get_pbe.h)0
-rw-r--r--src/pbe/pbe_base/info.txt15
-rw-r--r--src/pbe/pbes1/info.txt3
-rw-r--r--src/pbe/pbes2/info.txt3
-rw-r--r--src/pubkey/pubkey/info.txt5
7 files changed, 20 insertions, 8 deletions
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
index 81076718d..59f318a95 100644
--- a/src/core/libstate/info.txt
+++ b/src/core/libstate/info.txt
@@ -13,8 +13,6 @@ eng_def.h
engine.cpp
engine.h
get_enc.cpp
-get_pbe.cpp
-get_pbe.h
init.h
init_def.cpp
init_opt.cpp
diff --git a/src/core/libstate/get_pbe.cpp b/src/pbe/pbe_base/get_pbe.cpp
index cd1ed2aa4..cd1ed2aa4 100644
--- a/src/core/libstate/get_pbe.cpp
+++ b/src/pbe/pbe_base/get_pbe.cpp
diff --git a/src/core/libstate/get_pbe.h b/src/pbe/pbe_base/get_pbe.h
index e7b434c1f..e7b434c1f 100644
--- a/src/core/libstate/get_pbe.h
+++ b/src/pbe/pbe_base/get_pbe.h
diff --git a/src/pbe/pbe_base/info.txt b/src/pbe/pbe_base/info.txt
new file mode 100644
index 000000000..59cdae61f
--- /dev/null
+++ b/src/pbe/pbe_base/info.txt
@@ -0,0 +1,15 @@
+realname "PBE Base"
+
+load_on auto
+
+define PASSWORD_BASED_ENCRYPTION
+
+<requires>
+filters
+asn1
+</requires>
+
+<add>
+get_pbe.cpp
+get_pbe.h
+</add>
diff --git a/src/pbe/pbes1/info.txt b/src/pbe/pbes1/info.txt
index 96692a691..b00f4d60d 100644
--- a/src/pbe/pbes1/info.txt
+++ b/src/pbe/pbes1/info.txt
@@ -10,6 +10,5 @@ pbes1.h
</add>
<requires>
-asn1
-filters
+pbe_base
</requires>
diff --git a/src/pbe/pbes2/info.txt b/src/pbe/pbes2/info.txt
index a32f95cf0..e1e5807c2 100644
--- a/src/pbe/pbes2/info.txt
+++ b/src/pbe/pbes2/info.txt
@@ -10,6 +10,5 @@ pbes2.h
</add>
<requires>
-asn1
-filters
+pbe_base
</requires>
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index f6bb64a41..07fe1589f 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -1,13 +1,14 @@
realname "Public Key Base"
-define PUBKEY_BASE
+define PUBLIC_KEY_CRYPTO
load_on dep
<requires>
+asn1
bigint
numbertheory
-asn1
+pbe_base
</requires>
<add>