Syntax changes to the BER and DER APIs to improve readability of code

that uses them. These changes are not backwards compatible, this commit
updates all uses of the APIs within the library.

1 files changed, 4 insertions, 19 deletions

diff --git a/include/crl_ent.h b/include/crl_ent.h
index 660148211..510c4f5a8 100644
--- a/include/crl_ent.h
+++ b/include/crl_ent.h
@@ -13,9 +13,12 @@ namespace Botan {
 /*************************************************
 * CRL Entry                                      *
 *************************************************/
-class CRL_Entry
+class CRL_Entry : public ASN1_Object
    {
    public:
+      void encode_into(class DER_Encoder&) const;
+      void decode_from(class BER_Decoder&);
+
       MemoryVector<byte> serial;
       X509_Time time;
       CRL_Code reason;
@@ -30,24 +33,6 @@ bool operator==(const CRL_Entry&, const CRL_Entry&);
 bool operator!=(const CRL_Entry&, const CRL_Entry&);
 bool operator<(const CRL_Entry&, const CRL_Entry&);
 
-/*************************************************
-* DER Encoding Functions                         *
-*************************************************/
-namespace DER {
-
-void encode(DER_Encoder&, const CRL_Entry&);
-
-}
-
-/*************************************************
-* BER Decoding Functions                         *
-*************************************************/
-namespace BER {
-
-void decode(BER_Decoder&, CRL_Entry&);
-
-}
-
 }
 
 #endif