diff options
author | lloyd <lloyd@randombit.net> | 2009-12-16 02:52:12 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2009-12-16 02:52:12 +0000 |
commit | 317b76d71dca1840c9e72f9a26407590719c1423 (patch) | |
tree | 2eb49072e6e27f6ee41e704004aa8689b1e98bb3 /src/cert/x509 | |
parent | 457ce43934a4e51ead4d21e43013eef9d448d0e1 (diff) | |
parent | 12afeca214c4414a0ced0bc4654d0fc5908dc77b (diff) |
propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)
to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)
Diffstat (limited to 'src/cert/x509')
-rw-r--r-- | src/cert/x509/info.txt | 27 | ||||
-rw-r--r-- | src/cert/x509/x509_crl.h | 2 | ||||
-rw-r--r-- | src/cert/x509/x509_ext.cpp | 2 | ||||
-rw-r--r-- | src/cert/x509/x509cert.cpp | 2 |
4 files changed, 18 insertions, 15 deletions
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt index 37faea9fa..a5cd973a4 100644 --- a/src/cert/x509/info.txt +++ b/src/cert/x509/info.txt @@ -2,31 +2,34 @@ define X509 load_on auto -<add> +<header:public> certstor.h -certstor.cpp -crl_ent.cpp crl_ent.h pkcs10.h +x509_ca.h +x509_crl.h +x509_ext.h +x509_obj.h +x509cert.h +x509find.h +x509self.h +x509stor.h +</header:public> + +<source> +certstor.cpp +crl_ent.cpp pkcs10.cpp x509_ca.cpp -x509_ca.h x509_crl.cpp -x509_crl.h x509_ext.cpp -x509_ext.h x509_obj.cpp -x509_obj.h x509cert.cpp -x509cert.h x509find.cpp -x509find.h x509opt.cpp x509self.cpp -x509self.h x509stor.cpp -x509stor.h -</add> +</source> <requires> asn1 diff --git a/src/cert/x509/x509_crl.h b/src/cert/x509/x509_crl.h index 6caef42cc..a7903e7e6 100644 --- a/src/cert/x509/x509_crl.h +++ b/src/cert/x509/x509_crl.h @@ -23,7 +23,7 @@ class BOTAN_DLL X509_CRL : public X509_Object /** * This class represents CRL related errors. */ - struct X509_CRL_Error : public Exception + struct BOTAN_DLL X509_CRL_Error : public Exception { X509_CRL_Error(const std::string& error) : Exception("X509_CRL: " + error) {} diff --git a/src/cert/x509/x509_ext.cpp b/src/cert/x509/x509_ext.cpp index 5e07cbd27..e88b5a268 100644 --- a/src/cert/x509/x509_ext.cpp +++ b/src/cert/x509/x509_ext.cpp @@ -11,7 +11,7 @@ #include <botan/ber_dec.h> #include <botan/oids.h> #include <botan/libstate.h> -#include <botan/bit_ops.h> +#include <botan/internal/bit_ops.h> #include <algorithm> #include <memory> diff --git a/src/cert/x509/x509cert.cpp b/src/cert/x509/x509cert.cpp index 32c508a0c..e3844e8e9 100644 --- a/src/cert/x509/x509cert.cpp +++ b/src/cert/x509/x509cert.cpp @@ -9,7 +9,7 @@ #include <botan/x509_ext.h> #include <botan/der_enc.h> #include <botan/ber_dec.h> -#include <botan/stl_util.h> +#include <botan/internal/stl_util.h> #include <botan/parsing.h> #include <botan/bigint.h> #include <botan/oids.h> |