diff options
| author | Jack Lloyd <[email protected]> | 2018-07-04 17:47:59 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-07-04 17:47:59 -0400 |
| commit | 0e1e58b2107bf752b34646f3d2a0a8de24478b20 (patch) | |
| tree | 69b8ed5e78172cf80fcfd13733e703e23869fcef | |
| parent | 74a369bd77b43849a216c688af4bc85468291973 (diff) | |
Add a couple of OIDs commonly seen in certificates
| -rw-r--r-- | src/build-data/oids.txt | 3 | ||||
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt index 55acc0e9b..9c17a6756 100644 --- a/src/build-data/oids.txt +++ b/src/build-data/oids.txt @@ -258,6 +258,9 @@ 1.3.6.1.5.5.7.48.2 = PKIX.CertificateAuthorityIssuers 1.3.6.1.4.1.311.20.2.2 = Microsoft SmartcardLogon +1.3.6.1.4.1.311.20.2.3 = Microsoft UPN + +2.16.840.1.113730.1.13 = Certificate Comment # ECC param sets [ecc_param] diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index 138661a80..f24b82531 100644 --- a/src/lib/asn1/oid_maps.cpp +++ b/src/lib/asn1/oid_maps.cpp @@ -1,7 +1,7 @@ /* * OID maps * -* This file was automatically generated by ./src/scripts/oids.py on 2018-07-01 +* This file was automatically generated by ./src/scripts/oids.py on 2018-07-04 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -141,6 +141,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.3.6.1.4.1.3029.1.2.1", "ElGamal" }, { "1.3.6.1.4.1.3029.1.5.1", "OpenPGP.Curve25519" }, { "1.3.6.1.4.1.311.20.2.2", "Microsoft SmartcardLogon" }, + { "1.3.6.1.4.1.311.20.2.3", "Microsoft UPN" }, { "1.3.6.1.4.1.8301.3.1.2.9.0.38", "secp521r1" }, { "1.3.6.1.5.5.7.1.1", "PKIX.AuthorityInformationAccess" }, { "1.3.6.1.5.5.7.3.1", "PKIX.ServerAuth" }, @@ -195,6 +196,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "2.16.840.1.101.3.4.3.7", "DSA/EMSA1(SHA-3(384))" }, { "2.16.840.1.101.3.4.3.8", "DSA/EMSA1(SHA-3(512))" }, { "2.16.840.1.101.3.4.3.9", "ECDSA/EMSA1(SHA-3(224))" }, + { "2.16.840.1.113730.1.13", "Certificate Comment" }, { "2.5.29.14", "X509v3.SubjectKeyIdentifier" }, { "2.5.29.15", "X509v3.KeyUsage" }, { "2.5.29.17", "X509v3.SubjectAlternativeName" }, @@ -252,6 +254,7 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "Camellia-192/GCM", OID({0,3,4401,5,3,1,9,26}) }, { "Camellia-256/CBC", OID({1,2,392,200011,61,1,1,1,4}) }, { "Camellia-256/GCM", OID({0,3,4401,5,3,1,9,46}) }, + { "Certificate Comment", OID({2,16,840,1,113730,1,13}) }, { "ChaCha20Poly1305", OID({1,2,840,113549,1,9,16,3,18}) }, { "Compression.Zlib", OID({1,2,840,113549,1,9,16,3,8}) }, { "Curve25519", OID({1,3,101,110}) }, @@ -309,6 +312,7 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "MGF1", OID({1,2,840,113549,1,1,8}) }, { "McEliece", OID({1,3,6,1,4,1,25258,1,3}) }, { "Microsoft SmartcardLogon", OID({1,3,6,1,4,1,311,20,2,2}) }, + { "Microsoft UPN", OID({1,3,6,1,4,1,311,20,2,3}) }, { "OpenPGP.Curve25519", OID({1,3,6,1,4,1,3029,1,5,1}) }, { "OpenPGP.Ed25519", OID({1,3,6,1,4,1,11591,15,1}) }, { "PBE-PKCS5v20", OID({1,2,840,113549,1,5,13}) }, |