aboutsummaryrefslogtreecommitdiffstats
path: root/src/cryptography/x509/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/cryptography/x509/__init__.py')
-rw-r--r--src/cryptography/x509/__init__.py96
1 files changed, 45 insertions, 51 deletions
diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py
index 04a94a37..9cc78424 100644
--- a/src/cryptography/x509/__init__.py
+++ b/src/cryptography/x509/__init__.py
@@ -25,29 +25,55 @@ from cryptography.x509.general_name import (
)
from cryptography.x509.name import Name, NameAttribute
from cryptography.x509.oid import (
- OID_ANY_POLICY, OID_AUTHORITY_INFORMATION_ACCESS,
- OID_AUTHORITY_KEY_IDENTIFIER, OID_BASIC_CONSTRAINTS, OID_CA_ISSUERS,
- OID_CERTIFICATE_ISSUER, OID_CERTIFICATE_POLICIES, OID_CLIENT_AUTH,
+ ExtensionOID, OID_ANY_POLICY,
+ OID_CA_ISSUERS, OID_CERTIFICATE_ISSUER, OID_CLIENT_AUTH,
OID_CODE_SIGNING, OID_COMMON_NAME, OID_COUNTRY_NAME, OID_CPS_QUALIFIER,
- OID_CPS_USER_NOTICE, OID_CRL_DISTRIBUTION_POINTS, OID_CRL_REASON,
- OID_DN_QUALIFIER, OID_DOMAIN_COMPONENT, OID_DSA_WITH_SHA1,
- OID_DSA_WITH_SHA224, OID_DSA_WITH_SHA256, OID_ECDSA_WITH_SHA1,
- OID_ECDSA_WITH_SHA224, OID_ECDSA_WITH_SHA256, OID_ECDSA_WITH_SHA384,
- OID_ECDSA_WITH_SHA512, OID_EMAIL_ADDRESS, OID_EMAIL_PROTECTION,
- OID_EXTENDED_KEY_USAGE, OID_FRESHEST_CRL, OID_GENERATION_QUALIFIER,
- OID_GIVEN_NAME, OID_INHIBIT_ANY_POLICY, OID_INVALIDITY_DATE,
- OID_ISSUER_ALTERNATIVE_NAME, OID_KEY_USAGE, OID_LOCALITY_NAME,
- OID_NAME_CONSTRAINTS, OID_OCSP, OID_OCSP_NO_CHECK, OID_OCSP_SIGNING,
+ OID_CPS_USER_NOTICE, OID_CRL_REASON, OID_DN_QUALIFIER,
+ OID_DOMAIN_COMPONENT, OID_EMAIL_ADDRESS, OID_EMAIL_PROTECTION,
+ OID_GENERATION_QUALIFIER, OID_GIVEN_NAME, OID_INVALIDITY_DATE,
+ OID_LOCALITY_NAME, OID_OCSP, OID_OCSP_SIGNING,
OID_ORGANIZATIONAL_UNIT_NAME, OID_ORGANIZATION_NAME,
- OID_POLICY_CONSTRAINTS, OID_POLICY_MAPPINGS, OID_PSEUDONYM,
- OID_RSA_WITH_MD5, OID_RSA_WITH_SHA1, OID_RSA_WITH_SHA224,
- OID_RSA_WITH_SHA256, OID_RSA_WITH_SHA384, OID_RSA_WITH_SHA512,
- OID_SERIAL_NUMBER, OID_SERVER_AUTH, OID_STATE_OR_PROVINCE_NAME,
- OID_SUBJECT_ALTERNATIVE_NAME, OID_SUBJECT_DIRECTORY_ATTRIBUTES,
- OID_SUBJECT_INFORMATION_ACCESS, OID_SUBJECT_KEY_IDENTIFIER, OID_SURNAME,
- OID_TIME_STAMPING, OID_TITLE, _SIG_OIDS_TO_HASH
+ OID_PSEUDONYM, OID_SERIAL_NUMBER, OID_SERVER_AUTH,
+ OID_STATE_OR_PROVINCE_NAME, OID_SURNAME, OID_TIME_STAMPING, OID_TITLE,
+ SignatureAlgorithmOID, _SIG_OIDS_TO_HASH
)
+
+OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS
+OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER
+OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS
+OID_CERTIFICATE_POLICIES = ExtensionOID.CERTIFICATE_POLICIES
+OID_CRL_DISTRIBUTION_POINTS = ExtensionOID.CRL_DISTRIBUTION_POINTS
+OID_EXTENDED_KEY_USAGE = ExtensionOID.EXTENDED_KEY_USAGE
+OID_FRESHEST_CRL = ExtensionOID.FRESHEST_CRL
+OID_INHIBIT_ANY_POLICY = ExtensionOID.INHIBIT_ANY_POLICY
+OID_ISSUER_ALTERNATIVE_NAME = ExtensionOID.ISSUER_ALTERNATIVE_NAME
+OID_KEY_USAGE = ExtensionOID.KEY_USAGE
+OID_NAME_CONSTRAINTS = ExtensionOID.NAME_CONSTRAINTS
+OID_OCSP_NO_CHECK = ExtensionOID.OCSP_NO_CHECK
+OID_POLICY_CONSTRAINTS = ExtensionOID.POLICY_CONSTRAINTS
+OID_POLICY_MAPPINGS = ExtensionOID.POLICY_MAPPINGS
+OID_SUBJECT_ALTERNATIVE_NAME = ExtensionOID.SUBJECT_ALTERNATIVE_NAME
+OID_SUBJECT_DIRECTORY_ATTRIBUTES = ExtensionOID.SUBJECT_DIRECTORY_ATTRIBUTES
+OID_SUBJECT_INFORMATION_ACCESS = ExtensionOID.SUBJECT_INFORMATION_ACCESS
+OID_SUBJECT_KEY_IDENTIFIER = ExtensionOID.SUBJECT_KEY_IDENTIFIER
+
+OID_DSA_WITH_SHA1 = SignatureAlgorithmOID.DSA_WITH_SHA1
+OID_DSA_WITH_SHA224 = SignatureAlgorithmOID.DSA_WITH_SHA224
+OID_DSA_WITH_SHA256 = SignatureAlgorithmOID.DSA_WITH_SHA256
+OID_ECDSA_WITH_SHA1 = SignatureAlgorithmOID.ECDSA_WITH_SHA1
+OID_ECDSA_WITH_SHA224 = SignatureAlgorithmOID.ECDSA_WITH_SHA224
+OID_ECDSA_WITH_SHA256 = SignatureAlgorithmOID.ECDSA_WITH_SHA256
+OID_ECDSA_WITH_SHA384 = SignatureAlgorithmOID.ECDSA_WITH_SHA384
+OID_ECDSA_WITH_SHA512 = SignatureAlgorithmOID.ECDSA_WITH_SHA512
+OID_RSA_WITH_MD5 = SignatureAlgorithmOID.RSA_WITH_MD5
+OID_RSA_WITH_SHA1 = SignatureAlgorithmOID.RSA_WITH_SHA1
+OID_RSA_WITH_SHA224 = SignatureAlgorithmOID.RSA_WITH_SHA224
+OID_RSA_WITH_SHA256 = SignatureAlgorithmOID.RSA_WITH_SHA256
+OID_RSA_WITH_SHA384 = SignatureAlgorithmOID.RSA_WITH_SHA384
+OID_RSA_WITH_SHA512 = SignatureAlgorithmOID.RSA_WITH_SHA512
+
+
__all__ = [
"load_pem_x509_certificate",
"load_der_x509_certificate",
@@ -99,27 +125,9 @@ __all__ = [
"CertificateSigningRequestBuilder",
"CertificateBuilder",
"Version",
- "OID_SUBJECT_DIRECTORY_ATTRIBUTES",
- "OID_SUBJECT_KEY_IDENTIFIER",
- "OID_KEY_USAGE",
- "OID_SUBJECT_ALTERNATIVE_NAME",
- "OID_ISSUER_ALTERNATIVE_NAME",
- "OID_BASIC_CONSTRAINTS",
"OID_CRL_REASON",
"OID_INVALIDITY_DATE",
"OID_CERTIFICATE_ISSUER",
- "OID_NAME_CONSTRAINTS",
- "OID_CRL_DISTRIBUTION_POINTS",
- "OID_CERTIFICATE_POLICIES",
- "OID_POLICY_MAPPINGS",
- "OID_AUTHORITY_KEY_IDENTIFIER",
- "OID_POLICY_CONSTRAINTS",
- "OID_EXTENDED_KEY_USAGE",
- "OID_FRESHEST_CRL",
- "OID_INHIBIT_ANY_POLICY",
- "OID_AUTHORITY_INFORMATION_ACCESS",
- "OID_SUBJECT_INFORMATION_ACCESS",
- "OID_OCSP_NO_CHECK",
"OID_COMMON_NAME",
"OID_COUNTRY_NAME",
"OID_LOCALITY_NAME",
@@ -135,20 +143,6 @@ __all__ = [
"OID_PSEUDONYM",
"OID_DOMAIN_COMPONENT",
"OID_EMAIL_ADDRESS",
- "OID_RSA_WITH_MD5",
- "OID_RSA_WITH_SHA1",
- "OID_RSA_WITH_SHA224",
- "OID_RSA_WITH_SHA256",
- "OID_RSA_WITH_SHA384",
- "OID_RSA_WITH_SHA512",
- "OID_ECDSA_WITH_SHA1",
- "OID_ECDSA_WITH_SHA224",
- "OID_ECDSA_WITH_SHA256",
- "OID_ECDSA_WITH_SHA384",
- "OID_ECDSA_WITH_SHA512",
- "OID_DSA_WITH_SHA1",
- "OID_DSA_WITH_SHA224",
- "OID_DSA_WITH_SHA256",
"_SIG_OIDS_TO_HASH",
"OID_CPS_QUALIFIER",
"OID_CPS_USER_NOTICE",