commit d62ed9a17802c8b2136cfe119fcb56b1edc99d5c
author wbond <will@wbond.net> Fri Sep 15 07:13:52 2017 -0400
committer wbond <will@wbond.net> Fri Sep 15 07:13:52 2017 -0400
tree 2dc43211700bc7370ab375f315c0417955a65979
parent d83c39856cc454cd5f0b2be7533b656652e6e194

Update bundled definitions to use new tagging API

asn1crypto/ocsp.py

diff --git a/asn1crypto/ocsp.py b/asn1crypto/ocsp.py
index 52de481..f18d8e8 100644
--- a/asn1crypto/ocsp.py
+++ b/asn1crypto/ocsp.py
@@ -84,7 +84,7 @@
 class Request(Sequence):
     _fields = [
         ('req_cert', CertId),
-        ('single_request_extensions', RequestExtensions, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('single_request_extensions', RequestExtensions, {'explicit': 0, 'optional': True}),
     ]
 
     _processed_extensions = False
@@ -192,10 +192,10 @@
 
 class TBSRequest(Sequence):
     _fields = [
-        ('version', Version, {'tag_type': 'explicit', 'tag': 0, 'default': 'v1'}),
-        ('requestor_name', GeneralName, {'tag_type': 'explicit', 'tag': 1, 'optional': True}),
+        ('version', Version, {'explicit': 0, 'default': 'v1'}),
+        ('requestor_name', GeneralName, {'explicit': 1, 'optional': True}),
         ('request_list', Requests),
-        ('request_extensions', TBSRequestExtensions, {'tag_type': 'explicit', 'tag': 2, 'optional': True}),
+        ('request_extensions', TBSRequestExtensions, {'explicit': 2, 'optional': True}),
     ]
 
 
@@ -207,14 +207,14 @@
     _fields = [
         ('signature_algorithm', SignedDigestAlgorithm),
         ('signature', OctetBitString),
-        ('certs', Certificates, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('certs', Certificates, {'explicit': 0, 'optional': True}),
     ]
 
 
 class OCSPRequest(Sequence):
     _fields = [
         ('tbs_request', TBSRequest),
-        ('optional_signature', Signature, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('optional_signature', Signature, {'explicit': 0, 'optional': True}),
     ]
 
     _processed_extensions = False
@@ -314,31 +314,31 @@
 
 class ResponderId(Choice):
     _alternatives = [
-        ('by_name', Name, {'tag_type': 'explicit', 'tag': 1}),
-        ('by_key', OctetString, {'tag_type': 'explicit', 'tag': 2}),
+        ('by_name', Name, {'explicit': 1}),
+        ('by_key', OctetString, {'explicit': 2}),
     ]
 
 
 class RevokedInfo(Sequence):
     _fields = [
         ('revocation_time', GeneralizedTime),
-        ('revocation_reason', CRLReason, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('revocation_reason', CRLReason, {'explicit': 0, 'optional': True}),
     ]
 
 
 class CertStatus(Choice):
     _alternatives = [
-        ('good', Null, {'tag_type': 'implicit', 'tag': 0}),
-        ('revoked', RevokedInfo, {'tag_type': 'implicit', 'tag': 1}),
-        ('unknown', Null, {'tag_type': 'implicit', 'tag': 2}),
+        ('good', Null, {'implicit': 0}),
+        ('revoked', RevokedInfo, {'implicit': 1}),
+        ('unknown', Null, {'implicit': 2}),
     ]
 
 
 class CrlId(Sequence):
     _fields = [
-        ('crl_url', IA5String, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
-        ('crl_num', Integer, {'tag_type': 'explicit', 'tag': 1, 'optional': True}),
-        ('crl_time', GeneralizedTime, {'tag_type': 'explicit', 'tag': 2, 'optional': True}),
+        ('crl_url', IA5String, {'explicit': 0, 'optional': True}),
+        ('crl_num', Integer, {'explicit': 1, 'optional': True}),
+        ('crl_time', GeneralizedTime, {'explicit': 2, 'optional': True}),
     ]
 
 
@@ -383,8 +383,8 @@
         ('cert_id', CertId),
         ('cert_status', CertStatus),
         ('this_update', GeneralizedTime),
-        ('next_update', GeneralizedTime, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
-        ('single_extensions', SingleResponseExtensions, {'tag_type': 'explicit', 'tag': 1, 'optional': True}),
+        ('next_update', GeneralizedTime, {'explicit': 0, 'optional': True}),
+        ('single_extensions', SingleResponseExtensions, {'explicit': 1, 'optional': True}),
     ]
 
     _processed_extensions = False
@@ -529,11 +529,11 @@
 
 class ResponseData(Sequence):
     _fields = [
-        ('version', Version, {'tag_type': 'explicit', 'tag': 0, 'default': 'v1'}),
+        ('version', Version, {'explicit': 0, 'default': 'v1'}),
         ('responder_id', ResponderId),
         ('produced_at', GeneralizedTime),
         ('responses', Responses),
-        ('response_extensions', ResponseDataExtensions, {'tag_type': 'explicit', 'tag': 1, 'optional': True}),
+        ('response_extensions', ResponseDataExtensions, {'explicit': 1, 'optional': True}),
     ]
 
 
@@ -542,7 +542,7 @@
         ('tbs_response_data', ResponseData),
         ('signature_algorithm', SignedDigestAlgorithm),
         ('signature', OctetBitString),
-        ('certs', Certificates, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('certs', Certificates, {'explicit': 0, 'optional': True}),
     ]
 
 
@@ -561,7 +561,7 @@
 class OCSPResponse(Sequence):
     _fields = [
         ('response_status', OCSPResponseStatus),
-        ('response_bytes', ResponseBytes, {'tag_type': 'explicit', 'tag': 0, 'optional': True}),
+        ('response_bytes', ResponseBytes, {'explicit': 0, 'optional': True}),
     ]
 
     _processed_extensions = False