ANY DEFINED BY decoding implemented

2 files changed, 40 insertions, 0 deletions

diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
index 5424195..306f4b4 100644
--- a/pyasn1/codec/ber/decoder.py
+++ b/pyasn1/codec/ber/decoder.py
@@ -529,6 +529,18 @@ class UniversalConstructedTypeDecoder(AbstractConstructedDecoder):
                 )
                 idx += 1
 
+        for holeName, governingName, typesMap in namedTypes.holes:
+            holeComponent = asn1Object[holeName]
+            if holeComponent.isValue:
+                governingComponent = asn1Object[governingName]
+                if governingComponent in typesMap:
+                    component, rest = decodeFun(
+                        holeComponent.asOctets(),
+                        asn1Spec=typesMap[governingComponent]
+                    )
+                    asn1Object.setComponentByName(holeName, component, matchTags=False, matchConstraints=False)
+
+        if not namedTypes:
             asn1Object.verifySizeSpec()
 
         return asn1Object, tail
diff --git a/pyasn1/type/namedtype.py b/pyasn1/type/namedtype.py
index 7a51f18..3cdb2a6 100644
--- a/pyasn1/type/namedtype.py
+++ b/pyasn1/type/namedtype.py
@@ -34,6 +34,8 @@ class NamedType(object):
         self.__name = name
         self.__type = asn1Object
         self.__nameAndType = name, asn1Object
+        self.__governingName = None
+        self.__typesMap = None
 
     def __repr__(self):
         return '%s(%r, %r)' % (self.__class__.__name__, self.__name, self.__type)
@@ -73,6 +75,19 @@ class NamedType(object):
     def asn1Object(self):
         return self.__type
 
+    def definedBy(self, governingName, typesMap):
+        self.__governingName = governingName
+        self.__typesMap = typesMap
+        return self
+
+    @property
+    def governingName(self):
+        return self.__governingName
+
+    @property
+    def typesMap(self):
+        return self.__typesMap
+
     # Backward compatibility
 
     def getName(self):
@@ -123,6 +138,7 @@ class NamedTypes(object):
         self.__keys = frozenset([namedType.name for namedType in self.__namedTypes])
         self.__values = tuple([namedType.asn1Object for namedType in self.__namedTypes])
         self.__items = tuple([(namedType.name, namedType.asn1Object) for namedType in self.__namedTypes])
+        self.__holes = None
 
     def __repr__(self):
         return '%s(%s)' % (
@@ -509,3 +525,15 @@ class NamedTypes(object):
     @property
     def requiredComponents(self):
         return self.__requiredComponents
+
+    @property
+    def holes(self):
+        if self.__holes is None:
+            holes = []
+            for namedType in self.__namedTypes:
+                if namedType.governingName:
+                    holes.append((namedType.name, namedType.governingName, namedType.typesMap))
+
+            self.__holes = holes
+
+        return self.__holes