aboutsummaryrefslogtreecommitdiff
path: root/pyasn1_modules/rfc8226.py
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-07-31 10:36:45 +0200
committerGitHub <noreply@github.com>2019-07-31 10:36:45 +0200
commit3e2e4419553287df3f6a4071b49c6049f78be4be (patch)
tree5385178e4699ee2fe1b1c4ce446564aefde5a1f2 /pyasn1_modules/rfc8226.py
parenta2a8bbbcf2dff6e625ce6d601f1af9e84270c049 (diff)
downloadpyasn1-modules-3e2e4419553287df3f6a4071b49c6049f78be4be.tar.gz
Make SIZE OF constraint operational (#46)
Changes `ValueSizeConstraint` erroneously applied to `SequenceOf` and `SetOf` objects via `subtypeConstraint` attribute to be applied via `sizeSpec` attribute. Although `sizeSpec` takes the same constraint objects as `subtypeConstraint`, the former is only verified on de/serialization i.e. when the [constructed] object at hand is fully populated, while the latter is applied to [scalar] types at the moment of instantiation. This change also bumps pyasn1 requirement to 0.4.6.
Diffstat (limited to 'pyasn1_modules/rfc8226.py')
-rw-r--r--pyasn1_modules/rfc8226.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/pyasn1_modules/rfc8226.py b/pyasn1_modules/rfc8226.py
index b7df0b5..0c3dc21 100644
--- a/pyasn1_modules/rfc8226.py
+++ b/pyasn1_modules/rfc8226.py
@@ -41,7 +41,7 @@ class JWTClaimNames(univ.SequenceOf):
pass
JWTClaimNames.componentType = JWTClaimName()
-JWTClaimNames.subtypeSpec=constraint.ValueSizeConstraint(1, MAX)
+JWTClaimNames.sizeSpec = constraint.ValueSizeConstraint(1, MAX)
class JWTClaimPermittedValues(univ.Sequence):
@@ -51,7 +51,7 @@ JWTClaimPermittedValues.componentType = namedtype.NamedTypes(
namedtype.NamedType('claim', JWTClaimName()),
namedtype.NamedType('permitted', univ.SequenceOf(
componentType=char.UTF8String()).subtype(
- subtypeSpec=constraint.ValueSizeConstraint(1, MAX)))
+ sizeSpec=constraint.ValueSizeConstraint(1, MAX)))
)
@@ -59,7 +59,7 @@ class JWTClaimPermittedValuesList(univ.SequenceOf):
pass
JWTClaimPermittedValuesList.componentType = JWTClaimPermittedValues()
-JWTClaimPermittedValuesList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX)
+JWTClaimPermittedValuesList.sizeSpec = constraint.ValueSizeConstraint(1, MAX)
class JWTClaimConstraints(univ.Sequence):
@@ -125,8 +125,7 @@ class TNAuthorizationList(univ.SequenceOf):
pass
TNAuthorizationList.componentType = TNEntry()
-TNAuthorizationList.subtypeSpec=constraint.ValueSizeConstraint(1, MAX)
-
+TNAuthorizationList.sizeSpec = constraint.ValueSizeConstraint(1, MAX)
id_pe_TNAuthList = _OID(1, 3, 6, 1, 5, 5, 7, 1, 26)