diff options
| author | lloyd <[email protected]> | 2008-04-29 14:39:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-04-29 14:39:16 +0000 |
| commit | aacaef7d54e997834baf64308b39a102eeb3dd1f (patch) | |
| tree | 776d423b6b49283c5f9c682c10c548fd6898943c /include | |
| parent | af8b04c4583dfcad766eeed656650821a9de8675 (diff) | |
Move Signature_Format enum to pubkey.h
Including enums.h in needed places since asn1_int.h doesn't pull it in
anymore.
Remove Config::choose_sig_format, and move its logic into its only
caller, the (global!) choose_sig_format in x509_ca.cpp
Diffstat (limited to 'include')
| -rw-r--r-- | include/ber_dec.h | 1 | ||||
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | include/der_enc.h | 3 | ||||
| -rw-r--r-- | include/enums.h | 2 | ||||
| -rw-r--r-- | include/pbe_pkcs.h | 1 | ||||
| -rw-r--r-- | include/pkcs8.h | 1 | ||||
| -rw-r--r-- | include/pubkey.h | 2 | ||||
| -rw-r--r-- | include/x509_key.h | 1 | ||||
| -rw-r--r-- | include/x509_obj.h | 1 |
9 files changed, 8 insertions, 8 deletions
diff --git a/include/ber_dec.h b/include/ber_dec.h index 890af67a2..1ea880595 100644 --- a/include/ber_dec.h +++ b/include/ber_dec.h @@ -8,6 +8,7 @@ #include <botan/asn1_oid.h> #include <botan/data_src.h> +#include <botan/enums.h> namespace Botan { diff --git a/include/config.h b/include/config.h index 7ef873e8f..e0ceeb737 100644 --- a/include/config.h +++ b/include/config.h @@ -7,7 +7,6 @@ #define BOTAN_POLICY_CONF_H__ #include <botan/mutex.h> -#include <botan/enums.h> #include <string> #include <vector> #include <map> @@ -39,9 +38,6 @@ class BOTAN_DLL Config std::string deref_alias(const std::string&) const; void load_inifile(const std::string&); - - static void choose_sig_format(const std::string&, std::string&, - Signature_Format&); private: Config(const Config&) {} Config& operator=(const Config&) { return (*this); } diff --git a/include/der_enc.h b/include/der_enc.h index 86f33abe2..5b3c11489 100644 --- a/include/der_enc.h +++ b/include/der_enc.h @@ -6,8 +6,7 @@ #ifndef BOTAN_DER_ENCODER_H__ #define BOTAN_DER_ENCODER_H__ -#include <botan/secmem.h> -#include <botan/enums.h> +#include <botan/asn1_int.h> #include <vector> namespace Botan { diff --git a/include/enums.h b/include/enums.h index d12b5a1e3..dc404b728 100644 --- a/include/enums.h +++ b/include/enums.h @@ -53,8 +53,6 @@ enum X509_Encoding { RAW_BER, PEM }; enum Cipher_Dir { ENCRYPTION, DECRYPTION }; -enum Signature_Format { IEEE_1363, DER_SEQUENCE }; - enum Character_Set { LOCAL_CHARSET, UCS2_CHARSET, diff --git a/include/pbe_pkcs.h b/include/pbe_pkcs.h index cd2f27ce4..a01f70e66 100644 --- a/include/pbe_pkcs.h +++ b/include/pbe_pkcs.h @@ -8,6 +8,7 @@ #include <botan/pbe.h> #include <botan/pipe.h> +#include <botan/enums.h> namespace Botan { diff --git a/include/pkcs8.h b/include/pkcs8.h index 0c7c97e6c..aa36af30f 100644 --- a/include/pkcs8.h +++ b/include/pkcs8.h @@ -8,6 +8,7 @@ #include <botan/x509_key.h> #include <botan/ui.h> +#include <botan/enums.h> namespace Botan { diff --git a/include/pubkey.h b/include/pubkey.h index 798d97661..e4ea4e848 100644 --- a/include/pubkey.h +++ b/include/pubkey.h @@ -12,6 +12,8 @@ namespace Botan { +enum Signature_Format { IEEE_1363, DER_SEQUENCE }; + /************************************************* * Public Key Encryptor * *************************************************/ diff --git a/include/x509_key.h b/include/x509_key.h index 6f45887ca..abaeaaced 100644 --- a/include/x509_key.h +++ b/include/x509_key.h @@ -9,6 +9,7 @@ #include <botan/pipe.h> #include <botan/pk_keys.h> #include <botan/alg_id.h> +#include <botan/enums.h> namespace Botan { diff --git a/include/x509_obj.h b/include/x509_obj.h index 88110d9ad..55065f6f5 100644 --- a/include/x509_obj.h +++ b/include/x509_obj.h @@ -8,6 +8,7 @@ #include <botan/asn1_obj.h> #include <botan/pipe.h> +#include <botan/enums.h> #include <vector> namespace Botan { |