diff options
| author | Haibo Huang <hhb@google.com> | 2020-04-09 19:44:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-09 19:44:43 +0000 |
| commit | 563b3acca031bec0b68826a9ece2a56d2e788c92 (patch) | |
| tree | 1e56fddd4e95a55bf547e014d7ee168824c9e313 /tests/test_rfc5035.py | |
| parent | c340f08f61bbea0a35f7030eba6c67b93cbd43e2 (diff) | |
| parent | 368b2a975cce6644fc3eae509a1e20d80479b0f8 (diff) | |
| download | pyasn1-modules-563b3acca031bec0b68826a9ece2a56d2e788c92.tar.gz | |
Upgrade python/pyasn1-modules to v0.2.8 am: 9e51c9ac3a am: b3112bf96b am: 85aef04186 am: c1f0ae6dee am: 368b2a975c
Change-Id: I660502a9f9c89eef5cc7c3ffcc6f75c57a2a84c2
Diffstat (limited to 'tests/test_rfc5035.py')
| -rw-r--r-- | tests/test_rfc5035.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/test_rfc5035.py b/tests/test_rfc5035.py index b031c1b..22f0f36 100644 --- a/tests/test_rfc5035.py +++ b/tests/test_rfc5035.py @@ -76,8 +76,8 @@ T9yMtRLN5ZDU14y+Phzq9NKpSw/x5KyXoUKjCMc3Ru6dIW+CgcRQees+dhnvuD5U sat = sa['attrType'] sav0 = sa['attrValues'][0] - if sat in rfc5035.ESSAttributeMap.keys(): - sav, rest = der_decode(sav0, asn1Spec=rfc5035.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 @@ -138,16 +138,14 @@ vFIgX7eIkd8= sat = sa['attrType'] sav0 = sa['attrValues'][0] - if sat in rfc5035.ESSAttributeMap.keys(): - sav, rest = der_decode(sav0, asn1Spec=rfc5035.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(rfc5035.cmsContentTypesMapUpdate) - rfc5652.cmsAttributesMap.update(rfc5035.ESSAttributeMap) asn1Object, rest = der_decode(substrate, asn1Spec=self.asn1Spec, decodeOpenTypes=True) assert not rest @@ -171,7 +169,7 @@ vFIgX7eIkd8= # automatically decode it receipt, rest = der_decode(sd['encapContentInfo']['eContent'], asn1Spec=rfc5652.cmsContentTypesMap[sd['encapContentInfo']['eContentType']]) - assert receipt['version'] == rfc5035.ESSVersion().subtype(value='v1') + assert receipt['version'] == 1 suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__]) |