diff options
| author | Haibo Huang <hhb@google.com> | 2020-04-09 18:52:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-09 18:52:03 +0000 |
| commit | b3112bf96b1654e199489529e371faeaf1513057 (patch) | |
| tree | 1e56fddd4e95a55bf547e014d7ee168824c9e313 /tests/test_rfc2634.py | |
| parent | eeb43cc103f86efb51a0be45c93198e8364511c7 (diff) | |
| parent | 9e51c9ac3afb411a26639585a8c8574fdba24627 (diff) | |
| download | pyasn1-modules-b3112bf96b1654e199489529e371faeaf1513057.tar.gz | |
Upgrade python/pyasn1-modules to v0.2.8 am: 9e51c9ac3a
Change-Id: Ic039bcd255c8cbf407207af52426b09068701f01
Diffstat (limited to 'tests/test_rfc2634.py')
| -rw-r--r-- | tests/test_rfc2634.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/test_rfc2634.py b/tests/test_rfc2634.py index d57315b..18c8a3d 100644 --- a/tests/test_rfc2634.py +++ b/tests/test_rfc2634.py @@ -73,8 +73,8 @@ mNTr0mjYeUWRe/15IsWNx+kuFcLDr71DFHvMFY5M3sdfMA== sat = sa['attrType'] sav0 = sa['attrValues'][0] - if sat in rfc2634.ESSAttributeMap.keys(): - sav, rest = der_decode(sav0, asn1Spec=rfc2634.ESSAttributeMap[sat]) + if sat in rfc5652.cmsAttributesMap.keys(): + sav, rest = der_decode(sav0, asn1Spec=rfc5652.cmsAttributesMap[sat]) assert not rest assert sav.prettyPrint() assert der_encode(sav) == sav0 @@ -139,18 +139,17 @@ lropBdPJ6jIXiZQgCwxbGTCwCMQClaQ9K+L5LTeuW50ZKSIbmBZQ5dxjtnK3OlS sat = sa['attrType'] sav0 = sa['attrValues'][0] - if sat in rfc2634.ESSAttributeMap.keys(): - sav, rest = der_decode(sav0, asn1Spec=rfc2634.ESSAttributeMap[sat]) + if sat in rfc5652.cmsAttributesMap.keys(): + sav, rest = der_decode(sav0, asn1Spec=rfc5652.cmsAttributesMap[sat]) assert not rest assert sav.prettyPrint() assert der_encode(sav) == sav0 def testOpenTypes(self): substrate = pem.readBase64fromText(self.signed_receipt_pem_text) - rfc5652.cmsContentTypesMap.update(rfc2634.cmsContentTypesMapUpdate) - rfc5652.cmsAttributesMap.update(rfc2634.ESSAttributeMap) asn1Object, rest = der_decode(substrate, - asn1Spec=self.asn1Spec, decodeOpenTypes=True) + asn1Spec=self.asn1Spec, + decodeOpenTypes=True) assert not rest assert asn1Object.prettyPrint() assert der_encode(asn1Object) == substrate |