From 1d3f2bfc98a9f561891b7d772ad58d0c5d07edb9 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 12:15:09 -0500 Subject: Fixed #2531 -- added missing EV oid --- src/cryptography/x509/oid.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index ead40169..ebf6ca1d 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -80,6 +80,7 @@ class NameOID(object): 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") + JURISDICTION_COUNTRY_NAME = ObjectIdentifier("1.3.6.1.4.1.311.60.2.1.3") class SignatureAlgorithmOID(object): -- cgit v1.2.3 From 45e507f1349a0a7630408841b5470f36b2081925 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 13:44:23 -0500 Subject: added two more oids --- src/cryptography/x509/oid.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index ebf6ca1d..329eba9f 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -81,6 +81,11 @@ class NameOID(object): DOMAIN_COMPONENT = ObjectIdentifier("0.9.2342.19200300.100.1.25") EMAIL_ADDRESS = ObjectIdentifier("1.2.840.113549.1.9.1") JURISDICTION_COUNTRY_NAME = ObjectIdentifier("1.3.6.1.4.1.311.60.2.1.3") + JURISDICTION_LOCALITY_NAME = ObjectIdentifier("1.3.6.1.4.1.311.60.2.1.1") + JURISDICTION_STATE_OR_PROVINCE_NAME = ObjectIdentifier( + "1.3.6.1.4.1.311.60.2.1.2" + ) + class SignatureAlgorithmOID(object): -- cgit v1.2.3 From edfd8f83de5f9f6d6a71ff7e6705a7676abf8c5a Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 14:20:52 -0500 Subject: too many newlines --- src/cryptography/x509/oid.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 329eba9f..f398e46d 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -87,7 +87,6 @@ class NameOID(object): ) - class SignatureAlgorithmOID(object): RSA_WITH_MD5 = ObjectIdentifier("1.2.840.113549.1.1.4") RSA_WITH_SHA1 = ObjectIdentifier("1.2.840.113549.1.1.5") -- cgit v1.2.3 From a2293c813d2645ac1cdb9ee17da247e2e67fab20 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 20:49:15 -0500 Subject: added business category oid --- src/cryptography/x509/oid.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index f398e46d..b9a26e46 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -85,6 +85,7 @@ class NameOID(object): JURISDICTION_STATE_OR_PROVINCE_NAME = ObjectIdentifier( "1.3.6.1.4.1.311.60.2.1.2" ) + BUSINESS_CATEGORY = ObjectIdentifier("2.5.4.15") class SignatureAlgorithmOID(object): -- cgit v1.2.3 From dd18c032a1119aeb033071d51c23e464332a75c6 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 20:57:13 -0500 Subject: added oid names --- src/cryptography/x509/oid.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index b9a26e46..4ecd6cfe 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -157,6 +157,17 @@ _OID_NAMES = { NameOID.PSEUDONYM: "pseudonym", NameOID.DOMAIN_COMPONENT: "domainComponent", NameOID.EMAIL_ADDRESS: "emailAddress", + NameOID.JURISDICTION_COUNTRY_NAME: ( + "jurisdictionOfIncorporationCountryName" + ), + NameOID.JURISDICTION_LOCALITY_NAME: ( + "jurisdictionOfIncorporationLocalityName" + ), + NameOID.JURISDICTION_STATE_OR_PROVINCE_NAME: ( + "jurisdictionOfIncorporationStateOrProvinceName" + ), + NameOID.BUSINESS_CATEGORY: "businessCategory", + SignatureAlgorithmOID.RSA_WITH_MD5: "md5WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA1: "sha1WithRSAEncryption", SignatureAlgorithmOID.RSA_WITH_SHA224: "sha224WithRSAEncryption", -- cgit v1.2.3 From 3b2fc96c540ee9770f344c47e1217e0a8d8ffd1c Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Dec 2015 21:10:41 -0500 Subject: updated the short names of oids --- src/cryptography/x509/oid.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 4ecd6cfe..98a61e0b 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -157,14 +157,10 @@ _OID_NAMES = { NameOID.PSEUDONYM: "pseudonym", NameOID.DOMAIN_COMPONENT: "domainComponent", NameOID.EMAIL_ADDRESS: "emailAddress", - NameOID.JURISDICTION_COUNTRY_NAME: ( - "jurisdictionOfIncorporationCountryName" - ), - NameOID.JURISDICTION_LOCALITY_NAME: ( - "jurisdictionOfIncorporationLocalityName" - ), + NameOID.JURISDICTION_COUNTRY_NAME: "jurisdictionCountryName", + NameOID.JURISDICTION_LOCALITY_NAME: "jurisdictionLocalityName", NameOID.JURISDICTION_STATE_OR_PROVINCE_NAME: ( - "jurisdictionOfIncorporationStateOrProvinceName" + "jurisdictionStateOrProvinceName" ), NameOID.BUSINESS_CATEGORY: "businessCategory", -- cgit v1.2.3