diff options
author | Joel Galenson <jgalenson@google.com> | 2021-10-14 18:37:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-14 18:37:39 +0000 |
commit | 495a48923c4f4d8aad5409e5ecf31330a3c2a966 (patch) | |
tree | cd5d476feaf638c74ecec9096d65d1ca706e25b7 | |
parent | bcc0f3baee33b05f7cd30e96e577b16b5cb1d3d6 (diff) | |
parent | f0ba1a062e79e7577e4ff40942f4f62b851927f8 (diff) | |
download | oid-registry-495a48923c4f4d8aad5409e5ecf31330a3c2a966.tar.gz |
Merge "Upgrade rust/crates/oid-registry to 0.2.0" am: cb47065ff1 am: f0ba1a062e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oid-registry/+/1833674
Change-Id: I6ec0e8d8222a0db2ee19e6f9759433fdc1164419
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 13 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | assets/oid_db.txt | 2 | ||||
-rw-r--r-- | out/oid_db.rs | 6 |
7 files changed, 25 insertions, 14 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 923d411..e97a5e3 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "e1a07bd01119e16105bce07a506b08fef59eb561" + "sha1": "e76dab0733e5ba712dec0fbcdd7c2b7eed82e125" } } @@ -48,6 +48,8 @@ rust_library { name: "liboid_registry", host_supported: true, crate_name: "oid_registry", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: [ "src/lib.rs", ":copy_oid-registry_build_out", @@ -76,6 +78,8 @@ rust_defaults { "src/lib.rs", ":copy_oid-registry_build_out", ], + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -3,17 +3,16 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] edition = "2018" name = "oid-registry" -version = "0.1.5" +version = "0.2.0" authors = ["Pierre Chifflier <chifflier@wzdftpd.net>"] build = "build.rs" include = ["LICENSE-*", "README.md", ".gitignore", "Cargo.toml", "assets/*.txt", "build.rs", "src/*.rs"] @@ -27,7 +26,7 @@ repository = "https://github.com/rusticata/oid-registry.git" all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies.der-parser] -version = "5.1" +version = "6.0.0" [features] crypto = ["kdf", "pkcs1", "pkcs7", "pkcs9", "pkcs12", "nist_algs", "x962"] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 4e6a567..30c3128 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "oid-registry" -version = "0.1.5" +version = "0.2.0" authors = ["Pierre Chifflier <chifflier@wzdftpd.net>"] license = "MIT/Apache-2.0" description = "Object Identifier (OID) database" @@ -39,4 +39,4 @@ x509 = [] x962 = [] [dependencies] -der-parser = "5.1" +der-parser = "6.0.0" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/oid-registry/oid-registry-0.1.5.crate" + value: "https://static.crates.io/crates/oid-registry/oid-registry-0.2.0.crate" } - version: "0.1.5" + version: "0.2.0" license_type: NOTICE last_upgrade_date { year: 2021 - month: 8 - day: 9 + month: 9 + day: 22 } } diff --git a/assets/oid_db.txt b/assets/oid_db.txt index 68591f4..f24847a 100644 --- a/assets/oid_db.txt +++ b/assets/oid_db.txt @@ -101,6 +101,7 @@ x509 OID_X509_ALIASED_ENTRY_NAME 2.5.4.1 aliasedEntryName Aliased entry/object n x509 OID_X509_KNOWLEDGE_INFORMATION 2.5.4.2 knowledgeInformation 'knowledgeInformation' attribute type x509 OID_X509_COMMON_NAME 2.5.4.3 commonName Common Name x509 OID_X509_SURNAME 2.5.4.4 surname Surname +x509 OID_X509_SERIALNUMBER 2.5.4.5 serialNumber Serial Number x509 OID_X509_COUNTRY_NAME 2.5.4.6 countryName Country Name x509 OID_X509_LOCALITY_NAME 2.5.4.7 localityName Locality Name x509 OID_X509_STATE_OR_PROVINCE_NAME 2.5.4.8 stateOrProvinceName State or Province name @@ -114,6 +115,7 @@ x509 OID_X509_BUSINESS_CATEGORY 2.5.4.15 businessCategory Business Category x509 OID_X509_POSTAL_ADDRESS 2.5.4.16 postalAddress Postal Address x509 OID_X509_POSTAL_CODE 2.5.4.17 postalCode Postal Code # +x509 OID_X509_NAME 2.5.4.41 name Name x509 OID_X509_GIVEN_NAME 2.5.4.42 givenName Given Name # x509 OID_X509_UNIQUE_IDENTIFIER 2.5.4.45 uniqueIdentifier Bit String Unique Identifier diff --git a/out/oid_db.rs b/out/oid_db.rs index 11f4b14..b5fe081 100644 --- a/out/oid_db.rs +++ b/out/oid_db.rs @@ -136,6 +136,8 @@ pub const OID_X509_KNOWLEDGE_INFORMATION: Oid<'static> = oid!(2.5.4.2); pub const OID_X509_COMMON_NAME: Oid<'static> = oid!(2.5.4.3); /// 2.5.4.4 pub const OID_X509_SURNAME: Oid<'static> = oid!(2.5.4.4); +/// 2.5.4.5 +pub const OID_X509_SERIALNUMBER: Oid<'static> = oid!(2.5.4.5); /// 2.5.4.6 pub const OID_X509_COUNTRY_NAME: Oid<'static> = oid!(2.5.4.6); /// 2.5.4.7 @@ -160,6 +162,8 @@ pub const OID_X509_BUSINESS_CATEGORY: Oid<'static> = oid!(2.5.4.15); pub const OID_X509_POSTAL_ADDRESS: Oid<'static> = oid!(2.5.4.16); /// 2.5.4.17 pub const OID_X509_POSTAL_CODE: Oid<'static> = oid!(2.5.4.17); +/// 2.5.4.41 +pub const OID_X509_NAME: Oid<'static> = oid!(2.5.4.41); /// 2.5.4.42 pub const OID_X509_GIVEN_NAME: Oid<'static> = oid!(2.5.4.42); /// 2.5.4.45 @@ -353,6 +357,7 @@ impl<'a> OidRegistry<'a> { self.insert(oid!(2.5.4.2), OidEntry::new("knowledgeInformation", "'knowledgeInformation' attribute type")); self.insert(oid!(2.5.4.3), OidEntry::new("commonName", "Common Name")); self.insert(oid!(2.5.4.4), OidEntry::new("surname", "Surname")); + self.insert(oid!(2.5.4.5), OidEntry::new("serialNumber", "Serial Number")); self.insert(oid!(2.5.4.6), OidEntry::new("countryName", "Country Name")); self.insert(oid!(2.5.4.7), OidEntry::new("localityName", "Locality Name")); self.insert(oid!(2.5.4.8), OidEntry::new("stateOrProvinceName", "State or Province name")); @@ -365,6 +370,7 @@ impl<'a> OidRegistry<'a> { self.insert(oid!(2.5.4.15), OidEntry::new("businessCategory", "Business Category")); self.insert(oid!(2.5.4.16), OidEntry::new("postalAddress", "Postal Address")); self.insert(oid!(2.5.4.17), OidEntry::new("postalCode", "Postal Code")); + self.insert(oid!(2.5.4.41), OidEntry::new("name", "Name")); self.insert(oid!(2.5.4.42), OidEntry::new("givenName", "Given Name")); self.insert(oid!(2.5.4.45), OidEntry::new("uniqueIdentifier", "Bit String Unique Identifier")); self.insert(oid!(2.5.29.14), OidEntry::new("subjectKeyIdentifier", "X509v3 Subject Key Identifier")); |