diff options
| -rw-r--r-- | src/cryptography/x509/__init__.py | 44 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 62 |
2 files changed, 52 insertions, 54 deletions
diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py index 9cc78424..82e83616 100644 --- a/src/cryptography/x509/__init__.py +++ b/src/cryptography/x509/__init__.py @@ -25,16 +25,11 @@ from cryptography.x509.general_name 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 ) @@ -73,6 +68,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", @@ -128,21 +139,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", diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 87601f85..911343e3 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -58,21 +58,23 @@ OID_CRL_REASON = ObjectIdentifier("2.5.29.21") OID_INVALIDITY_DATE = ObjectIdentifier("2.5.29.24") OID_CERTIFICATE_ISSUER = ObjectIdentifier("2.5.29.29") -OID_COMMON_NAME = ObjectIdentifier("2.5.4.3") -OID_COUNTRY_NAME = ObjectIdentifier("2.5.4.6") -OID_LOCALITY_NAME = ObjectIdentifier("2.5.4.7") -OID_STATE_OR_PROVINCE_NAME = ObjectIdentifier("2.5.4.8") -OID_ORGANIZATION_NAME = ObjectIdentifier("2.5.4.10") -OID_ORGANIZATIONAL_UNIT_NAME = ObjectIdentifier("2.5.4.11") -OID_SERIAL_NUMBER = ObjectIdentifier("2.5.4.5") -OID_SURNAME = ObjectIdentifier("2.5.4.4") -OID_GIVEN_NAME = ObjectIdentifier("2.5.4.42") -OID_TITLE = ObjectIdentifier("2.5.4.12") -OID_GENERATION_QUALIFIER = ObjectIdentifier("2.5.4.44") -OID_DN_QUALIFIER = ObjectIdentifier("2.5.4.46") -OID_PSEUDONYM = ObjectIdentifier("2.5.4.65") -OID_DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") -OID_EMAIL_ADDRESS = ObjectIdentifier("1.2.840.113549.1.9.1") + +class NameOID(object): + COMMON_NAME = ObjectIdentifier("2.5.4.3") + COUNTRY_NAME = ObjectIdentifier("2.5.4.6") + LOCALITY_NAME = ObjectIdentifier("2.5.4.7") + STATE_OR_PROVINCE_NAME = ObjectIdentifier("2.5.4.8") + ORGANIZATION_NAME = ObjectIdentifier("2.5.4.10") + ORGANIZATIONAL_UNIT_NAME = ObjectIdentifier("2.5.4.11") + SERIAL_NUMBER = ObjectIdentifier("2.5.4.5") + SURNAME = ObjectIdentifier("2.5.4.4") + GIVEN_NAME = ObjectIdentifier("2.5.4.42") + TITLE = ObjectIdentifier("2.5.4.12") + GENERATION_QUALIFIER = ObjectIdentifier("2.5.4.44") + DN_QUALIFIER = ObjectIdentifier("2.5.4.46") + PSEUDONYM = ObjectIdentifier("2.5.4.65") + DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") + EMAIL_ADDRESS = ObjectIdentifier("1.2.840.113549.1.9.1") class SignatureAlgorithmOID(object): @@ -123,21 +125,21 @@ OID_CPS_USER_NOTICE = ObjectIdentifier("1.3.6.1.5.5.7.2.2") OID_ANY_POLICY = ObjectIdentifier("2.5.29.32.0") _OID_NAMES = { - OID_COMMON_NAME: "commonName", - OID_COUNTRY_NAME: "countryName", - OID_LOCALITY_NAME: "localityName", - OID_STATE_OR_PROVINCE_NAME: "stateOrProvinceName", - OID_ORGANIZATION_NAME: "organizationName", - OID_ORGANIZATIONAL_UNIT_NAME: "organizationalUnitName", - OID_SERIAL_NUMBER: "serialNumber", - OID_SURNAME: "surname", - OID_GIVEN_NAME: "givenName", - OID_TITLE: "title", - OID_GENERATION_QUALIFIER: "generationQualifier", - OID_DN_QUALIFIER: "dnQualifier", - OID_PSEUDONYM: "pseudonym", - OID_DOMAIN_COMPONENT: "domainComponent", - OID_EMAIL_ADDRESS: "emailAddress", + NameOID.COMMON_NAME: "commonName", + NameOID.COUNTRY_NAME: "countryName", + NameOID.LOCALITY_NAME: "localityName", + NameOID.STATE_OR_PROVINCE_NAME: "stateOrProvinceName", + NameOID.ORGANIZATION_NAME: "organizationName", + NameOID.ORGANIZATIONAL_UNIT_NAME: "organizationalUnitName", + NameOID.SERIAL_NUMBER: "serialNumber", + NameOID.SURNAME: "surname", + NameOID.GIVEN_NAME: "givenName", + NameOID.TITLE: "title", + NameOID.GENERATION_QUALIFIER: "generationQualifier", + NameOID.DN_QUALIFIER: "dnQualifier", + NameOID.PSEUDONYM: "pseudonym", + NameOID.DOMAIN_COMPONENT: "domainComponent", + NameOID.EMAIL_ADDRESS: "emailAddress", SignatureAlgorithmOID.RSA_WITH_MD5: "md5WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA1: "sha1WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA224: "sha224WithRSAEncryption", |