propagate from branch 'net.randombit.botan' (head 95eb8083f5884531e5ca0667388f8a6fb6d05c41)

            to branch 'net.randombit.botan.c++0x' (head 56e105e678540c8bcafa4d0198c19a9489fbf8d1)

31 files changed, 113 insertions, 96 deletions

diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 5d3396216..33af9a8e5 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -13,9 +13,8 @@ dh_op.h
 </add>
 
 <requires>
-asn1
-bigint
 dl_algo
+dl_group
+libstate
 numbertheory
-pubkey
 </requires>
diff --git a/src/pubkey/dl_algo/info.txt b/src/pubkey/dl_algo/info.txt
index d3368765a..15a77516b 100644
--- a/src/pubkey/dl_algo/info.txt
+++ b/src/pubkey/dl_algo/info.txt
@@ -11,6 +11,8 @@ dl_algo.h
 
 <requires>
 asn1
-bigint
 dl_group
+numbertheory
+pk_codecs
+rng
 </requires>
diff --git a/src/pubkey/dl_group/info.txt b/src/pubkey/dl_group/info.txt
index 62446091f..6b9884a4d 100644
--- a/src/pubkey/dl_group/info.txt
+++ b/src/pubkey/dl_group/info.txt
@@ -12,4 +12,8 @@ dl_group.h
 <requires>
 asn1
 bigint
+filters
+libstate
+numbertheory
+pem
 </requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index 1a09dcbc5..5138aafc5 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -10,7 +10,7 @@ dlies.h
 </add>
 
 <requires>
-dh
-kdf2
-pubkey
+kdf
+libstate
+mac
 </requires>
diff --git a/src/pubkey/dsa/info.txt b/src/pubkey/dsa/info.txt
index f1b505800..c70e02d90 100644
--- a/src/pubkey/dsa/info.txt
+++ b/src/pubkey/dsa/info.txt
@@ -4,15 +4,6 @@ define DSA
 
 load_on auto
 
-<requires>
-asn1
-bigint
-dl_algo
-keypair
-numbertheory
-pubkey
-</requires>
-
 <add>
 dsa.cpp
 dsa.h
@@ -21,3 +12,11 @@ dsa_core.h
 dsa_op.cpp
 dsa_op.h
 </add>
+
+<requires>
+dl_algo
+dl_group
+keypair
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/ec_dompar/info.txt b/src/pubkey/ec_dompar/info.txt
index 59032ce90..212783725 100644
--- a/src/pubkey/ec_dompar/info.txt
+++ b/src/pubkey/ec_dompar/info.txt
@@ -12,6 +12,7 @@ ec_dompar.h
 <requires>
 asn1
 bigint
-numbertheory
+filters
 gfpmath
+hex
 </requires>
diff --git a/src/pubkey/ecc_key/info.txt b/src/pubkey/ecc_key/info.txt
index c5213aef4..2a3c9a3b2 100644
--- a/src/pubkey/ecc_key/info.txt
+++ b/src/pubkey/ecc_key/info.txt
@@ -4,16 +4,17 @@ define ECC_PUBLIC_KEY_CRYPTO
 
 load_on auto
 
+<add>
+ecc_key.cpp
+ecc_key.h
+</add>
+
 <requires>
+alloc
 asn1
 bigint
 ec_dompar
-numbertheory
 gfpmath
-pubkey
+numbertheory
+pk_codecs
 </requires>
-
-<add>
-ecc_key.cpp
-ecc_key.h
-</add>
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index 48e88bda9..743440f8f 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -4,16 +4,6 @@ define ECDSA
 
 load_on auto
 
-<requires>
-asn1
-bigint
-ec_dompar
-ecc_key
-numbertheory
-gfpmath
-pubkey
-</requires>
-
 <add>
 ecdsa.cpp
 ecdsa.h
@@ -22,3 +12,14 @@ ecdsa_core.h
 ecdsa_op.cpp
 ecdsa_op.h
 </add>
+
+<requires>
+alloc
+asn1
+ec_dompar
+ecc_key
+gfpmath
+libstate
+numbertheory
+rng
+</requires>
diff --git a/src/pubkey/eckaeg/info.txt b/src/pubkey/eckaeg/info.txt
index bac47f861..6b78f7de5 100644
--- a/src/pubkey/eckaeg/info.txt
+++ b/src/pubkey/eckaeg/info.txt
@@ -4,16 +4,6 @@ define ECKAEG
 
 load_on auto
 
-<requires>
-asn1
-bigint
-ec_dompar
-ecc_key
-numbertheory
-gfpmath
-pubkey
-</requires>
-
 <add>
 eckaeg.cpp
 eckaeg.h
@@ -22,3 +12,13 @@ eckaeg_core.h
 eckaeg_op.cpp
 eckaeg_op.h
 </add>
+
+<requires>
+alloc
+asn1
+ec_dompar
+ecc_key
+gfpmath
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index c457e1529..d7ae614ea 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -4,16 +4,6 @@ define ELGAMAL
 
 load_on auto
 
-<requires>
-asn1
-bigint
-bigint
-dl_algo
-keypair
-numbertheory
-pubkey
-</requires>
-
 <add>
 elgamal.cpp
 elgamal.h
@@ -22,3 +12,11 @@ elg_core.h
 elg_op.cpp
 elg_op.h
 </add>
+
+<requires>
+dl_algo
+dl_group
+keypair
+libstate
+numbertheory
+</requires>
diff --git a/src/pubkey/if_algo/info.txt b/src/pubkey/if_algo/info.txt
index 7686ed398..d2142f42f 100644
--- a/src/pubkey/if_algo/info.txt
+++ b/src/pubkey/if_algo/info.txt
@@ -4,12 +4,6 @@ define IF_PUBLIC_KEY_FAMILY
 
 load_on dep
 
-<requires>
-asn1
-bigint
-filters
-</requires>
-
 <add>
 if_algo.cpp
 if_algo.h
@@ -18,3 +12,11 @@ if_core.h
 if_op.cpp
 if_op.h
 </add>
+
+<requires>
+asn1
+bigint
+libstate
+numbertheory
+pk_codecs
+</requires>
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/info.txt
index 83b2c80cc..ee8da5b9d 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -4,16 +4,6 @@ define PUBLIC_KEY_CRYPTO
 
 load_on auto
 
-<requires>
-asn1
-bigint
-numbertheory
-pbe
-oid_lookup
-pk_pad
-rng
-</requires>
-
 <add>
 pk_algs.cpp
 pk_algs.h
@@ -21,12 +11,20 @@ pk_filts.cpp
 pk_filts.h
 pk_keys.cpp
 pk_keys.h
-pkcs8.cpp
-pkcs8.h
 pubkey.cpp
 pubkey.h
 pubkey_enums.cpp
 pubkey_enums.h
-x509_key.cpp
-x509_key.h
 </add>
+
+<requires>
+alloc
+asn1
+bigint
+filters
+kdf
+oid_lookup
+pk_pad
+rng
+sym_algo
+</requires>
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index c6fa4af5d..9e758643f 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -10,5 +10,5 @@ keypair.h
 </add>
 
 <requires>
-pubkey
+libstate
 </requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index 6434d4385..c89820aeb 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -14,10 +14,9 @@ nr_op.h
 </add>
 
 <requires>
-asn1
-bigint
 dl_algo
+dl_group
 keypair
+libstate
 numbertheory
-pubkey
 </requires>
diff --git a/src/pubkey/pubkey/pk_algs.cpp b/src/pubkey/pk_algs.cpp
index 99d7294f0..99d7294f0 100644
--- a/src/pubkey/pubkey/pk_algs.cpp
+++ b/src/pubkey/pk_algs.cpp
diff --git a/src/pubkey/pubkey/pk_algs.h b/src/pubkey/pk_algs.h
index d32c9365b..c41bf1a63 100644
--- a/src/pubkey/pubkey/pk_algs.h
+++ b/src/pubkey/pk_algs.h
@@ -8,8 +8,7 @@
 #ifndef BOTAN_PK_KEY_FACTORY_H__
 #define BOTAN_PK_KEY_FACTORY_H__
 
-#include <botan/x509_key.h>
-#include <botan/pkcs8.h>
+#include <botan/pk_keys.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/pk_codecs/info.txt b/src/pubkey/pk_codecs/info.txt
new file mode 100644
index 000000000..96511a663
--- /dev/null
+++ b/src/pubkey/pk_codecs/info.txt
@@ -0,0 +1,18 @@
+realname "PK codecs (PKCS8, X.509)"
+
+load_on auto
+
+<add>
+pkcs8.h
+pkcs8.cpp
+x509_key.h
+x509_key.cpp
+</add>
+
+<requires>
+asn1
+filters
+oid_lookup
+pbe
+pem
+</requires>
diff --git a/src/pubkey/pubkey/pkcs8.cpp b/src/pubkey/pk_codecs/pkcs8.cpp
index 87f05da92..87f05da92 100644
--- a/src/pubkey/pubkey/pkcs8.cpp
+++ b/src/pubkey/pk_codecs/pkcs8.cpp
diff --git a/src/pubkey/pubkey/pkcs8.h b/src/pubkey/pk_codecs/pkcs8.h
index 87f8ba326..87f8ba326 100644
--- a/src/pubkey/pubkey/pkcs8.h
+++ b/src/pubkey/pk_codecs/pkcs8.h
diff --git a/src/pubkey/pubkey/x509_key.cpp b/src/pubkey/pk_codecs/x509_key.cpp
index f1fc59410..f1fc59410 100644
--- a/src/pubkey/pubkey/x509_key.cpp
+++ b/src/pubkey/pk_codecs/x509_key.cpp
diff --git a/src/pubkey/pubkey/x509_key.h b/src/pubkey/pk_codecs/x509_key.h
index 9404b7ecc..9404b7ecc 100644
--- a/src/pubkey/pubkey/x509_key.h
+++ b/src/pubkey/pk_codecs/x509_key.h
diff --git a/src/pubkey/pubkey/pk_filts.cpp b/src/pubkey/pk_filts.cpp
index 18da9c10b..18da9c10b 100644
--- a/src/pubkey/pubkey/pk_filts.cpp
+++ b/src/pubkey/pk_filts.cpp
diff --git a/src/pubkey/pubkey/pk_filts.h b/src/pubkey/pk_filts.h
index 8bf3fc238..8bf3fc238 100644
--- a/src/pubkey/pubkey/pk_filts.h
+++ b/src/pubkey/pk_filts.h
diff --git a/src/pubkey/pubkey/pk_keys.cpp b/src/pubkey/pk_keys.cpp
index b93158558..b93158558 100644
--- a/src/pubkey/pubkey/pk_keys.cpp
+++ b/src/pubkey/pk_keys.cpp
diff --git a/src/pubkey/pubkey/pk_keys.h b/src/pubkey/pk_keys.h
index 5b612577d..5b612577d 100644
--- a/src/pubkey/pubkey/pk_keys.h
+++ b/src/pubkey/pk_keys.h
diff --git a/src/pubkey/pubkey/pubkey.cpp b/src/pubkey/pubkey.cpp
index 4ddaa6fb6..4ddaa6fb6 100644
--- a/src/pubkey/pubkey/pubkey.cpp
+++ b/src/pubkey/pubkey.cpp
diff --git a/src/pubkey/pubkey/pubkey.h b/src/pubkey/pubkey.h
index 815550edd..815550edd 100644
--- a/src/pubkey/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
diff --git a/src/pubkey/pubkey/pubkey_enums.cpp b/src/pubkey/pubkey_enums.cpp
index 327107dd1..327107dd1 100644
--- a/src/pubkey/pubkey/pubkey_enums.cpp
+++ b/src/pubkey/pubkey_enums.cpp
diff --git a/src/pubkey/pubkey/pubkey_enums.h b/src/pubkey/pubkey_enums.h
index 53e319f38..53e319f38 100644
--- a/src/pubkey/pubkey/pubkey_enums.h
+++ b/src/pubkey/pubkey_enums.h
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index ac2b6dde7..7729fd83d 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -4,16 +4,14 @@ define RSA
 
 load_on auto
 
+<add>
+rsa.cpp
+rsa.h
+</add>
+
 <requires>
-asn1
-bigint
 if_algo
 keypair
+libstate
 numbertheory
-pubkey
 </requires>
-
-<add>
-rsa.cpp
-rsa.h
-</add>
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 40c849d1c..ada6c37d6 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -4,16 +4,14 @@ define RW
 
 load_on auto
 
+<add>
+rw.cpp
+rw.h
+</add>
+
 <requires>
-asn1
-bigint
 if_algo
 keypair
+libstate
 numbertheory
-pubkey
 </requires>
-
-<add>
-rw.cpp
-rw.h
-</add>