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, 16 insertions, 1 deletions

diff --git a/include/asn1_int.h b/include/asn1_int.h
index 40ddbb444..85f763f26 100644
--- a/include/asn1_int.h
+++ b/include/asn1_int.h
@@ -6,8 +6,9 @@
 #ifndef BOTAN_ASN1_H__
 #define BOTAN_ASN1_H__
 
-#include <botan/bigint.h>
+#include <botan/secmem.h>
 #include <botan/enums.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
@@ -18,10 +19,23 @@ class ASN1_Object
    {
    public:
       virtual void encode_into(class DER_Encoder&) const = 0;
+      virtual void decode_from(class BER_Decoder&) = 0;
       virtual ~ASN1_Object() {}
    };
 
 /*************************************************
+* BER Encoded Object                             *
+*************************************************/
+class BER_Object
+   {
+   public:
+      void assert_is_a(ASN1_Tag, ASN1_Tag);
+
+      ASN1_Tag type_tag, class_tag;
+      SecureVector<byte> value;
+   };
+
+/*************************************************
 * ASN.1 Utility Functions                        *
 *************************************************/
 class DataSource;
@@ -29,6 +43,7 @@ class DataSource;
 namespace ASN1 {
 
 SecureVector<byte> put_in_sequence(const MemoryRegion<byte>&);
+std::string to_string(const BER_Object&);
 bool maybe_BER(DataSource&);
 
 }