diff options
author | Haibo Huang <hhb@google.com> | 2020-04-08 14:20:57 -0700 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2020-04-09 18:33:07 +0000 |
commit | 9e51c9ac3afb411a26639585a8c8574fdba24627 (patch) | |
tree | 1e56fddd4e95a55bf547e014d7ee168824c9e313 /pyasn1_modules/rfc5958.py | |
parent | eeb43cc103f86efb51a0be45c93198e8364511c7 (diff) | |
parent | 87e78d03b7b7f9f35afdf7fe85fe55410e5be4ab (diff) | |
download | pyasn1-modules-9e51c9ac3afb411a26639585a8c8574fdba24627.tar.gz |
Upgrade python/pyasn1-modules to v0.2.8
Exempt-From-Owner-Approval: Upgrade library
Change-Id: I2ff4d2fc587b3443fe8162de4f3fee4c648becf0
Diffstat (limited to 'pyasn1_modules/rfc5958.py')
-rw-r--r-- | pyasn1_modules/rfc5958.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pyasn1_modules/rfc5958.py b/pyasn1_modules/rfc5958.py index d8c7c90..1aaa928 100644 --- a/pyasn1_modules/rfc5958.py +++ b/pyasn1_modules/rfc5958.py @@ -16,6 +16,7 @@ from pyasn1.type import univ, constraint, namedtype, namedval, tag from pyasn1_modules import rfc5280 +from pyasn1_modules import rfc5652 MAX = float('inf') @@ -49,7 +50,7 @@ class PrivateKey(univ.OctetString): class Attributes(univ.SetOf): - componentType = rfc5280.Attribute() + componentType = rfc5652.Attribute() class PublicKey(univ.BitString): @@ -87,9 +88,11 @@ AsymmetricKeyPackage.componentType = OneAsymmetricKey() AsymmetricKeyPackage.sizeSpec=constraint.ValueSizeConstraint(1, MAX) -# Map of Content Type OIDs to Content Types -# To be added to the ones that are in rfc5652.py +# Map of Content Type OIDs to Content Types is added to the +# ones that are in rfc5652.py -cmsContentTypesMapUpdate = { +_cmsContentTypesMapUpdate = { id_ct_KP_aKeyPackage: AsymmetricKeyPackage(), } + +rfc5652.cmsContentTypesMap.update(_cmsContentTypesMapUpdate) |