diff --git a/lib/display.go b/lib/display.go index d4820b9..1c98d53 100644 --- a/lib/display.go +++ b/lib/display.go @@ -226,17 +226,17 @@ func oidify(oid asn1.ObjectIdentifier) string { raw := oid.String() names := map[string]string{ "2.5.4.3": "CommonName", - "2.5.4.5": "Serial Number", + "2.5.4.5": "EV Incorporation Registration Number", "2.5.4.6": "Country", "2.5.4.7": "Locality", "2.5.4.8": "Province", "2.5.4.10": "Organization", - "2.5.4.11": "OrganizationalUnit", + "2.5.4.11": "Organizational Unit", "2.5.4.15": "Business Category", "1.2.840.113549.1.9.1": "emailAddress", - "1.3.6.1.4.1.311.60.2.1.1": "EV Locality", - "1.3.6.1.4.1.311.60.2.1.2": "EV Province", - "1.3.6.1.4.1.311.60.2.1.3": "EV Country", + "1.3.6.1.4.1.311.60.2.1.1": "EV Incorporation Locality", + "1.3.6.1.4.1.311.60.2.1.2": "EV Incorporation Province", + "1.3.6.1.4.1.311.60.2.1.3": "EV Incorporation Country", } name, ok := names[raw] if ok { diff --git a/tests/dump-cert-chain-to-text.t b/tests/dump-cert-chain-to-text.t index e4c71df..d2704ef 100644 --- a/tests/dump-cert-chain-to-text.t +++ b/tests/dump-cert-chain-to-text.t @@ -117,17 +117,17 @@ Dump a live cert chain (squareup-chain.crt) \tCountry: US (esc) \tProvince: California (esc) \tLocality: San Francisco (esc) - \tEV Country: US (esc) - \tEV Province: Delaware (esc) + \tEV Incorporation Country: US (esc) + \tEV Incorporation Province: Delaware (esc) \tOrganization: Square, Inc. (esc) \tBusiness Category: Private Organization (esc) - \tSerial Number: 4699855 (esc) + \tEV Incorporation Registration Number: 4699855 (esc) \tCommonName: www.squareup.com (esc) Issuer Info: \tCountry: US (esc) \tOrganization: Entrust, Inc. (esc) - \tOrganizationalUnit: See www.entrust.net/legal-terms (esc) - \tOrganizationalUnit: (c) 2014 Entrust, Inc. - for authorized use only (esc) + \tOrganizational Unit: See www.entrust.net/legal-terms (esc) + \tOrganizational Unit: (c) 2014 Entrust, Inc. - for authorized use only (esc) \tCommonName: Entrust Certification Authority - L1M (esc) Subject Key ID : D4:17:14:6F:0B:C5:20:A1:D6:FE:21:7E:DC:9E:F8:57:9C:ED:AE:6A Authority Key ID : C3:F7:D0:B5:2A:30:AD:AF:0D:91:21:70:39:54:DD:BC:89:70:C7:3A @@ -158,14 +158,14 @@ Dump a live cert chain (squareup-chain.crt) Subject Info: \tCountry: US (esc) \tOrganization: Entrust, Inc. (esc) - \tOrganizationalUnit: See www.entrust.net/legal-terms (esc) - \tOrganizationalUnit: (c) 2014 Entrust, Inc. - for authorized use only (esc) + \tOrganizational Unit: See www.entrust.net/legal-terms (esc) + \tOrganizational Unit: (c) 2014 Entrust, Inc. - for authorized use only (esc) \tCommonName: Entrust Certification Authority - L1M (esc) Issuer Info: \tCountry: US (esc) \tOrganization: Entrust, Inc. (esc) - \tOrganizationalUnit: See www.entrust.net/legal-terms (esc) - \tOrganizationalUnit: (c) 2009 Entrust, Inc. - for authorized use only (esc) + \tOrganizational Unit: See www.entrust.net/legal-terms (esc) + \tOrganizational Unit: (c) 2009 Entrust, Inc. - for authorized use only (esc) \tCommonName: Entrust Root Certification Authority - G2 (esc) Subject Key ID : C3:F7:D0:B5:2A:30:AD:AF:0D:91:21:70:39:54:DD:BC:89:70:C7:3A Authority Key ID : 6A:72:26:7A:D0:1E:EF:7D:E7:3B:69:51:D4:6C:8D:9F:90:12:66:AB @@ -185,14 +185,14 @@ Dump a live cert chain (squareup-chain.crt) Subject Info: \tCountry: US (esc) \tOrganization: Entrust, Inc. (esc) - \tOrganizationalUnit: See www.entrust.net/legal-terms (esc) - \tOrganizationalUnit: (c) 2009 Entrust, Inc. - for authorized use only (esc) + \tOrganizational Unit: See www.entrust.net/legal-terms (esc) + \tOrganizational Unit: (c) 2009 Entrust, Inc. - for authorized use only (esc) \tCommonName: Entrust Root Certification Authority - G2 (esc) Issuer Info: \tCountry: US (esc) \tOrganization: Entrust, Inc. (esc) - \tOrganizationalUnit: www.entrust.net/CPS is incorporated by reference (esc) - \tOrganizationalUnit: (c) 2006 Entrust, Inc. (esc) + \tOrganizational Unit: www.entrust.net/CPS is incorporated by reference (esc) + \tOrganizational Unit: (c) 2006 Entrust, Inc. (esc) \tCommonName: Entrust Root Certification Authority (esc) Subject Key ID : 6A:72:26:7A:D0:1E:EF:7D:E7:3B:69:51:D4:6C:8D:9F:90:12:66:AB Authority Key ID : 68:90:E4:67:A4:A6:53:80:C7:86:66:A4:F1:F7:4B:43:FB:84:BD:6D diff --git a/tests/dump-leaf-to-text.t b/tests/dump-leaf-to-text.t index d2abcc7..602b216 100644 --- a/tests/dump-leaf-to-text.t +++ b/tests/dump-leaf-to-text.t @@ -36,13 +36,13 @@ Dump an example certificate (example-leaf.crt) \tCountry: US (esc) \tProvince: CA (esc) \tOrganization: certigo (esc) - \tOrganizationalUnit: example (esc) + \tOrganizational Unit: example (esc) \tCommonName: example-leaf (esc) Issuer Info: \tCountry: US (esc) \tProvince: CA (esc) \tOrganization: certigo (esc) - \tOrganizationalUnit: example (esc) + \tOrganizational Unit: example (esc) \tCommonName: example-leaf (esc) Extended Key Usage: \tClient Auth (esc) diff --git a/tests/dump-small-key-to-text.t b/tests/dump-small-key-to-text.t index 797eef8..35b30f3 100644 --- a/tests/dump-small-key-to-text.t +++ b/tests/dump-small-key-to-text.t @@ -29,13 +29,13 @@ Dump an example certificate (example-leaf.crt) \tCountry: US (esc) \tProvince: CA (esc) \tOrganization: certigo (esc) - \tOrganizationalUnit: example (esc) + \tOrganizational Unit: example (esc) \tCommonName: example-small-key (esc) Issuer Info: \tCountry: US (esc) \tProvince: CA (esc) \tOrganization: certigo (esc) - \tOrganizationalUnit: example (esc) + \tOrganizational Unit: example (esc) \tCommonName: example-small-key (esc) Warnings: \tCertificate is not in X509v3 format (version is 2) (esc)