Added authority info access syntax extension to Certificate in addition to CRL
diff --git a/asn1crypto/crl.py b/asn1crypto/crl.py
index e90ffd2..63c376c 100644
--- a/asn1crypto/crl.py
+++ b/asn1crypto/crl.py
@@ -24,10 +24,10 @@
SequenceOf,
)
from .x509 import (
+ AuthorityInfoAccessSyntax,
AuthorityKeyIdentifier,
CRLDistributionPoints,
DistributionPointName,
- GeneralName,
GeneralNames,
Name,
ReasonFlags,
@@ -58,24 +58,6 @@
]
-class AccessMethod(ObjectIdentifier):
- _map = {
- '1.3.6.1.5.5.7.48.1': 'ocsp',
- '1.3.6.1.5.5.7.48.2': 'ca_issuers',
- }
-
-
-class AccessDescription(Sequence):
- _fields = [
- ('access_method', AccessMethod),
- ('access_location', GeneralName),
- ]
-
-
-class AuthorityInfoAccessSyntax(SequenceOf):
- _child_spec = AccessDescription
-
-
class TBSCertListExtensionId(ObjectIdentifier):
_map = {
'2.5.29.18': 'issuer_alt_name',
diff --git a/asn1crypto/x509.py b/asn1crypto/x509.py
index a6b7868..e932d0c 100644
--- a/asn1crypto/x509.py
+++ b/asn1crypto/x509.py
@@ -635,6 +635,24 @@
_child_spec = KeyPurposeId
+class AccessMethod(ObjectIdentifier):
+ _map = {
+ '1.3.6.1.5.5.7.48.1': 'ocsp',
+ '1.3.6.1.5.5.7.48.2': 'ca_issuers',
+ }
+
+
+class AccessDescription(Sequence):
+ _fields = [
+ ('access_method', AccessMethod),
+ ('access_location', GeneralName),
+ ]
+
+
+class AuthorityInfoAccessSyntax(SequenceOf):
+ _child_spec = AccessDescription
+
+
class EntrustVersionInfo(Sequence):
_fields = [
('entrust_vers', GeneralString),
@@ -672,6 +690,7 @@
'2.5.29.36': 'policy_constraints',
'2.5.29.37': 'extended_key_usage',
'2.5.29.54': 'inhibit_any_policy',
+ '1.3.6.1.5.5.7.1.1': 'authority_information_access',
'1.3.6.1.5.5.7.48.1.5': 'ocsp_no_check',
'1.2.840.113533.7.65.0': 'entrust_version_extension',
'2.16.840.1.113730.1.1': 'netscape_certificate_type',
@@ -702,6 +721,7 @@
'policy_constraints': PolicyConstraints,
'extended_key_usage': ExtKeyUsageSyntax,
'inhibit_any_policy': Integer,
+ 'authority_information_access': AuthorityInfoAccessSyntax,
'ocsp_no_check': Null,
'entrust_version_extension': EntrustVersionInfo,
'netscape_certificate_type': NetscapeCertificateType,