aboutsummaryrefslogtreecommitdiffstats
path: root/src/cert/x509/x509_obj.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-27 16:51:00 +0000
committerlloyd <[email protected]>2012-05-27 16:51:00 +0000
commit0beeb8caab674b173902b3a44952240d34710d30 (patch)
tree64d95e58bbd3b16b5fb6d3768ccfd4829f6731f9 /src/cert/x509/x509_obj.h
parent446d572d4984fa1f62001a0db7ac65b1201cbf45 (diff)
Derive X509_Object from ASN1_Object.
In the path validator, pass singlular Certificate_Store args as const reference and const_cast them. It's not ideal but it seems to lead to the cleanest external API. Treat all v1 X.509 certs as implicit CAs.
Diffstat (limited to 'src/cert/x509/x509_obj.h')
-rw-r--r--src/cert/x509/x509_obj.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509/x509_obj.h
index e91389acf..75a0b5c02 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509/x509_obj.h
@@ -20,7 +20,7 @@ namespace Botan {
* This class represents abstract X.509 signed objects as
* in the X.500 SIGNED macro
*/
-class BOTAN_DLL X509_Object
+class BOTAN_DLL X509_Object : public ASN1_Object
{
public:
/**
@@ -72,6 +72,10 @@ class BOTAN_DLL X509_Object
*/
bool check_signature(const Public_Key* key) const;
+ void encode_into(class DER_Encoder& to) const override;
+
+ void decode_from(class BER_Decoder& from) override;
+
/**
* @return BER encoding of this
*/
@@ -104,7 +108,6 @@ class BOTAN_DLL X509_Object
private:
virtual void force_decode() = 0;
void init(DataSource&, const std::string&);
- void decode_info(DataSource&);
std::vector<std::string> PEM_labels_allowed;
std::string PEM_label_pref;