1 files changed, 48 insertions, 19 deletions

diff --git a/src/asn1/ber_dec.h b/src/asn1/ber_dec.h
index 5f79d3fc1..87039ed93 100644
--- a/src/asn1/ber_dec.h
+++ b/src/asn1/ber_dec.h
@@ -20,33 +20,61 @@ class BOTAN_DLL BER_Decoder
    {
    public:
       BER_Object get_next_object();
-      void push_back(const BER_Object&);
+      void push_back(const BER_Object& obj);
 
       bool more_items() const;
       BER_Decoder& verify_end();
       BER_Decoder& discard_remaining();
 
-      BER_Decoder  start_cons(ASN1_Tag, ASN1_Tag = UNIVERSAL);
+      BER_Decoder  start_cons(ASN1_Tag type_tag, ASN1_Tag class_tag = UNIVERSAL);
       BER_Decoder& end_cons();
 
-      BER_Decoder& raw_bytes(MemoryRegion<byte>&);
+      BER_Decoder& raw_bytes(MemoryRegion<byte>& v);
 
       BER_Decoder& decode_null();
-      BER_Decoder& decode(bool&);
-      BER_Decoder& decode(size_t&);
-      BER_Decoder& decode(class BigInt&);
-      BER_Decoder& decode(MemoryRegion<byte>&, ASN1_Tag);
+      BER_Decoder& decode(bool& v);
+      BER_Decoder& decode(size_t& v);
+      BER_Decoder& decode(class BigInt& v);
+      BER_Decoder& decode(MemoryRegion<byte>& v, ASN1_Tag type_tag);
 
-      BER_Decoder& decode(bool&, ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
-      BER_Decoder& decode(size_t&, ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
-      BER_Decoder& decode(class BigInt&,
-                          ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
-      BER_Decoder& decode(MemoryRegion<byte>&, ASN1_Tag,
-                          ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
+      BER_Decoder& decode(bool& v,
+                          ASN1_Tag type_tag,
+                          ASN1_Tag class_tag = CONTEXT_SPECIFIC);
 
-      BER_Decoder& decode(class ASN1_Object&);
+      BER_Decoder& decode(size_t& v,
+                          ASN1_Tag type_tag,
+                          ASN1_Tag class_tag = CONTEXT_SPECIFIC);
 
-      BER_Decoder& decode_octet_string_bigint(class BigInt&);
+      BER_Decoder& decode(class BigInt& v,
+                          ASN1_Tag type_tag,
+                          ASN1_Tag class_tag = CONTEXT_SPECIFIC);
+
+      BER_Decoder& decode(MemoryRegion<byte>& v,
+                          ASN1_Tag real_type,
+                          ASN1_Tag type_tag,
+                          ASN1_Tag class_tag = CONTEXT_SPECIFIC);
+
+      BER_Decoder& decode(class ASN1_Object& obj);
+
+      BER_Decoder& decode_octet_string_bigint(class BigInt& b);
+
+      u64bit decode_constrained_integer(ASN1_Tag type_tag,
+                                        ASN1_Tag class_tag,
+                                        size_t T_bytes);
+
+      template<typename T> BER_Decoder& decode_integer_type(T& out)
+         {
+         return decode_integer_type<T>(out, INTEGER, UNIVERSAL);
+         }
+
+      template<typename T>
+         BER_Decoder& decode_integer_type(T& out,
+                                          ASN1_Tag type_tag,
+                                          ASN1_Tag class_tag = CONTEXT_SPECIFIC)
+         {
+         out = decode_constrained_integer(type_tag, class_tag, sizeof(out));
+         return (*this);
+         }
 
       template<typename T>
          BER_Decoder& decode_optional(T& out,
@@ -71,8 +99,11 @@ class BOTAN_DLL BER_Decoder
          return (*this);
          }
 
-      BER_Decoder& decode_optional_string(MemoryRegion<byte>&,
-                                          ASN1_Tag, u16bit);
+      BER_Decoder& decode_optional_string(MemoryRegion<byte>& out,
+                                          ASN1_Tag real_type,
+                                          u16bit type_no);
+
+      BER_Decoder& operator=(const BER_Decoder&) = delete;
 
       BER_Decoder(DataSource&);
       BER_Decoder(const byte[], size_t);
@@ -80,8 +111,6 @@ class BOTAN_DLL BER_Decoder
       BER_Decoder(const BER_Decoder&);
       ~BER_Decoder();
    private:
-      BER_Decoder& operator=(const BER_Decoder&) { return (*this); }
-
       BER_Decoder* parent;
       DataSource* source;
       BER_Object pushed;