diff options
Diffstat (limited to 'src/cryptography/x509/__init__.py')
| -rw-r--r-- | src/cryptography/x509/__init__.py | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py index 3d947dc7..353cd5b1 100644 --- a/src/cryptography/x509/__init__.py +++ b/src/cryptography/x509/__init__.py @@ -23,16 +23,11 @@ from cryptography.x509.base import ( ) from cryptography.x509.name import Name, NameAttribute from cryptography.x509.oid import ( - ExtensionOID, OID_ANY_POLICY, + ExtensionOID, NameOID, 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_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_PSEUDONYM, OID_SERIAL_NUMBER, OID_SERVER_AUTH, - OID_STATE_OR_PROVINCE_NAME, OID_SURNAME, OID_TIME_STAMPING, OID_TITLE, + OID_CODE_SIGNING, OID_CPS_QUALIFIER, OID_CPS_USER_NOTICE, OID_CRL_REASON, + OID_EMAIL_PROTECTION, OID_INVALIDITY_DATE, OID_OCSP, OID_OCSP_SIGNING, + OID_SERVER_AUTH, OID_TIME_STAMPING, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH ) @@ -71,6 +66,22 @@ OID_RSA_WITH_SHA256 = SignatureAlgorithmOID.RSA_WITH_SHA256 OID_RSA_WITH_SHA384 = SignatureAlgorithmOID.RSA_WITH_SHA384 OID_RSA_WITH_SHA512 = SignatureAlgorithmOID.RSA_WITH_SHA512 +OID_COMMON_NAME = NameOID.COMMON_NAME +OID_COUNTRY_NAME = NameOID.COUNTRY_NAME +OID_DOMAIN_COMPONENT = NameOID.DOMAIN_COMPONENT +OID_DN_QUALIFIER = NameOID.DN_QUALIFIER +OID_EMAIL_ADDRESS = NameOID.EMAIL_ADDRESS +OID_GENERATION_QUALIFIER = NameOID.GENERATION_QUALIFIER +OID_GIVEN_NAME = NameOID.GIVEN_NAME +OID_LOCALITY_NAME = NameOID.LOCALITY_NAME +OID_ORGANIZATIONAL_UNIT_NAME = NameOID.ORGANIZATIONAL_UNIT_NAME +OID_ORGANIZATION_NAME = NameOID.ORGANIZATION_NAME +OID_PSEUDONYM = NameOID.PSEUDONYM +OID_SERIAL_NUMBER = NameOID.SERIAL_NUMBER +OID_STATE_OR_PROVINCE_NAME = NameOID.STATE_OR_PROVINCE_NAME +OID_SURNAME = NameOID.SURNAME +OID_TITLE = NameOID.TITLE + __all__ = [ "load_pem_x509_certificate", @@ -126,21 +137,6 @@ __all__ = [ "OID_CRL_REASON", "OID_INVALIDITY_DATE", "OID_CERTIFICATE_ISSUER", - "OID_COMMON_NAME", - "OID_COUNTRY_NAME", - "OID_LOCALITY_NAME", - "OID_STATE_OR_PROVINCE_NAME", - "OID_ORGANIZATION_NAME", - "OID_ORGANIZATIONAL_UNIT_NAME", - "OID_SERIAL_NUMBER", - "OID_SURNAME", - "OID_GIVEN_NAME", - "OID_TITLE", - "OID_GENERATION_QUALIFIER", - "OID_DN_QUALIFIER", - "OID_PSEUDONYM", - "OID_DOMAIN_COMPONENT", - "OID_EMAIL_ADDRESS", "_SIG_OIDS_TO_HASH", "OID_CPS_QUALIFIER", "OID_CPS_USER_NOTICE", |