Merge "Upgrade rust/crates/der-oid-macro to 0.5.0" am: 568c0bada6 am: 24ad1ba50f am: 31a5f9b2a6 am: 59e2e864bf am: b42d7bec6b

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/1833274

Change-Id: I282622e5f357c72573ddb19ea63bb8622f97aa34

7 files changed, 261 insertions, 78 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 3c083e8..dc1841a 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "ebbea4bd6d42ad878ca2b9cdc53291f4ae19481a"
+    "sha1": "658513e9518f792daf7ed7bf53db906ba3eccfed"
   }
 }
diff --git a/Android.bp b/Android.bp
index 9ff9825..2170aa3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_der-oid-macro_license"],
 }
@@ -42,10 +40,11 @@ license {
 rust_proc_macro {
     name: "libder_oid_macro",
     crate_name: "der_oid_macro",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.5.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
-        "libnom",
         "libnum_bigint",
         "libnum_traits",
         "libsyn",
diff --git a/Cargo.toml b/Cargo.toml
index 63b3325..d7b4145 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "der-oid-macro"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Pierre Chifflier <chifflier@wzdftpd.net>", "Jannik Schürg <schuerg@ins.uni-bonn.de>"]
 description = "Macro to encode DER oids at compile time"
 homepage = "https://github.com/rusticata/der-parser"
@@ -22,9 +22,6 @@ repository = "https://github.com/rusticata/der-parser.git"
 
 [lib]
 proc-macro = true
-[dependencies.nom]
-version = "6.0"
-
 [dependencies.num-bigint]
 version = "0.4"
 
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index fbf8a6f..f068b66 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
 [package]
 name = "der-oid-macro"
 description = "Macro to encode DER oids at compile time"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2018"
 license = "MIT/Apache-2.0"
 homepage = "https://github.com/rusticata/der-parser"
@@ -12,7 +12,6 @@ authors = ["Pierre Chifflier <chifflier@wzdftpd.net>", "Jannik Schürg <schuerg@
 proc-macro = true
 
 [dependencies]
-nom = "6.0"
 num-bigint = "0.4"
 num-traits = "0.2"
 syn = "1.0"
diff --git a/METADATA b/METADATA
index 4280ee7..2cdfcd7 100644
--- a/METADATA
+++ b/METADATA
@@ -7,14 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/der-oid-macro/der-oid-macro-0.4.0.crate"
+    value: "https://static.crates.io/crates/der-oid-macro/der-oid-macro-0.5.0.crate"
   }
-  version: "0.4.0"
-  # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+  version: "0.5.0"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 7
-    day: 9
+    month: 9
+    day: 28
   }
 }
diff --git a/patches/licenses.patch b/patches/licenses.patch
new file mode 100644
index 0000000..b7d3c73
--- /dev/null
+++ b/patches/licenses.patch
@@ -0,0 +1,238 @@
+diff --git a/LICENSE-APACHE b/LICENSE-APACHE
+new file mode 100644
+index 0000000..16fe87b
+--- /dev/null
++++ b/LICENSE-APACHE
+@@ -0,0 +1,201 @@
++                              Apache License
++                        Version 2.0, January 2004
++                     http://www.apache.org/licenses/
++
++TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
++
++1. Definitions.
++
++   "License" shall mean the terms and conditions for use, reproduction,
++   and distribution as defined by Sections 1 through 9 of this document.
++
++   "Licensor" shall mean the copyright owner or entity authorized by
++   the copyright owner that is granting the License.
++
++   "Legal Entity" shall mean the union of the acting entity and all
++   other entities that control, are controlled by, or are under common
++   control with that entity. For the purposes of this definition,
++   "control" means (i) the power, direct or indirect, to cause the
++   direction or management of such entity, whether by contract or
++   otherwise, or (ii) ownership of fifty percent (50%) or more of the
++   outstanding shares, or (iii) beneficial ownership of such entity.
++
++   "You" (or "Your") shall mean an individual or Legal Entity
++   exercising permissions granted by this License.
++
++   "Source" form shall mean the preferred form for making modifications,
++   including but not limited to software source code, documentation
++   source, and configuration files.
++
++   "Object" form shall mean any form resulting from mechanical
++   transformation or translation of a Source form, including but
++   not limited to compiled object code, generated documentation,
++   and conversions to other media types.
++
++   "Work" shall mean the work of authorship, whether in Source or
++   Object form, made available under the License, as indicated by a
++   copyright notice that is included in or attached to the work
++   (an example is provided in the Appendix below).
++
++   "Derivative Works" shall mean any work, whether in Source or Object
++   form, that is based on (or derived from) the Work and for which the
++   editorial revisions, annotations, elaborations, or other modifications
++   represent, as a whole, an original work of authorship. For the purposes
++   of this License, Derivative Works shall not include works that remain
++   separable from, or merely link (or bind by name) to the interfaces of,
++   the Work and Derivative Works thereof.
++
++   "Contribution" shall mean any work of authorship, including
++   the original version of the Work and any modifications or additions
++   to that Work or Derivative Works thereof, that is intentionally
++   submitted to Licensor for inclusion in the Work by the copyright owner
++   or by an individual or Legal Entity authorized to submit on behalf of
++   the copyright owner. For the purposes of this definition, "submitted"
++   means any form of electronic, verbal, or written communication sent
++   to the Licensor or its representatives, including but not limited to
++   communication on electronic mailing lists, source code control systems,
++   and issue tracking systems that are managed by, or on behalf of, the
++   Licensor for the purpose of discussing and improving the Work, but
++   excluding communication that is conspicuously marked or otherwise
++   designated in writing by the copyright owner as "Not a Contribution."
++
++   "Contributor" shall mean Licensor and any individual or Legal Entity
++   on behalf of whom a Contribution has been received by Licensor and
++   subsequently incorporated within the Work.
++
++2. Grant of Copyright License. Subject to the terms and conditions of
++   this License, each Contributor hereby grants to You a perpetual,
++   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
++   copyright license to reproduce, prepare Derivative Works of,
++   publicly display, publicly perform, sublicense, and distribute the
++   Work and such Derivative Works in Source or Object form.
++
++3. Grant of Patent License. Subject to the terms and conditions of
++   this License, each Contributor hereby grants to You a perpetual,
++   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
++   (except as stated in this section) patent license to make, have made,
++   use, offer to sell, sell, import, and otherwise transfer the Work,
++   where such license applies only to those patent claims licensable
++   by such Contributor that are necessarily infringed by their
++   Contribution(s) alone or by combination of their Contribution(s)
++   with the Work to which such Contribution(s) was submitted. If You
++   institute patent litigation against any entity (including a
++   cross-claim or counterclaim in a lawsuit) alleging that the Work
++   or a Contribution incorporated within the Work constitutes direct
++   or contributory patent infringement, then any patent licenses
++   granted to You under this License for that Work shall terminate
++   as of the date such litigation is filed.
++
++4. Redistribution. You may reproduce and distribute copies of the
++   Work or Derivative Works thereof in any medium, with or without
++   modifications, and in Source or Object form, provided that You
++   meet the following conditions:
++
++   (a) You must give any other recipients of the Work or
++       Derivative Works a copy of this License; and
++
++   (b) You must cause any modified files to carry prominent notices
++       stating that You changed the files; and
++
++   (c) You must retain, in the Source form of any Derivative Works
++       that You distribute, all copyright, patent, trademark, and
++       attribution notices from the Source form of the Work,
++       excluding those notices that do not pertain to any part of
++       the Derivative Works; and
++
++   (d) If the Work includes a "NOTICE" text file as part of its
++       distribution, then any Derivative Works that You distribute must
++       include a readable copy of the attribution notices contained
++       within such NOTICE file, excluding those notices that do not
++       pertain to any part of the Derivative Works, in at least one
++       of the following places: within a NOTICE text file distributed
++       as part of the Derivative Works; within the Source form or
++       documentation, if provided along with the Derivative Works; or,
++       within a display generated by the Derivative Works, if and
++       wherever such third-party notices normally appear. The contents
++       of the NOTICE file are for informational purposes only and
++       do not modify the License. You may add Your own attribution
++       notices within Derivative Works that You distribute, alongside
++       or as an addendum to the NOTICE text from the Work, provided
++       that such additional attribution notices cannot be construed
++       as modifying the License.
++
++   You may add Your own copyright statement to Your modifications and
++   may provide additional or different license terms and conditions
++   for use, reproduction, or distribution of Your modifications, or
++   for any such Derivative Works as a whole, provided Your use,
++   reproduction, and distribution of the Work otherwise complies with
++   the conditions stated in this License.
++
++5. Submission of Contributions. Unless You explicitly state otherwise,
++   any Contribution intentionally submitted for inclusion in the Work
++   by You to the Licensor shall be under the terms and conditions of
++   this License, without any additional terms or conditions.
++   Notwithstanding the above, nothing herein shall supersede or modify
++   the terms of any separate license agreement you may have executed
++   with Licensor regarding such Contributions.
++
++6. Trademarks. This License does not grant permission to use the trade
++   names, trademarks, service marks, or product names of the Licensor,
++   except as required for reasonable and customary use in describing the
++   origin of the Work and reproducing the content of the NOTICE file.
++
++7. Disclaimer of Warranty. Unless required by applicable law or
++   agreed to in writing, Licensor provides the Work (and each
++   Contributor provides its Contributions) on an "AS IS" BASIS,
++   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
++   implied, including, without limitation, any warranties or conditions
++   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
++   PARTICULAR PURPOSE. You are solely responsible for determining the
++   appropriateness of using or redistributing the Work and assume any
++   risks associated with Your exercise of permissions under this License.
++
++8. Limitation of Liability. In no event and under no legal theory,
++   whether in tort (including negligence), contract, or otherwise,
++   unless required by applicable law (such as deliberate and grossly
++   negligent acts) or agreed to in writing, shall any Contributor be
++   liable to You for damages, including any direct, indirect, special,
++   incidental, or consequential damages of any character arising as a
++   result of this License or out of the use or inability to use the
++   Work (including but not limited to damages for loss of goodwill,
++   work stoppage, computer failure or malfunction, or any and all
++   other commercial damages or losses), even if such Contributor
++   has been advised of the possibility of such damages.
++
++9. Accepting Warranty or Additional Liability. While redistributing
++   the Work or Derivative Works thereof, You may choose to offer,
++   and charge a fee for, acceptance of support, warranty, indemnity,
++   or other liability obligations and/or rights consistent with this
++   License. However, in accepting such obligations, You may act only
++   on Your own behalf and on Your sole responsibility, not on behalf
++   of any other Contributor, and only if You agree to indemnify,
++   defend, and hold each Contributor harmless for any liability
++   incurred by, or claims asserted against, such Contributor by reason
++   of your accepting any such warranty or additional liability.
++
++END OF TERMS AND CONDITIONS
++
++APPENDIX: How to apply the Apache License to your work.
++
++   To apply the Apache License to your work, attach the following
++   boilerplate notice, with the fields enclosed by brackets "[]"
++   replaced with your own identifying information. (Don't include
++   the brackets!)  The text should be enclosed in the appropriate
++   comment syntax for the file format. We also recommend that a
++   file or class name and description of purpose be included on the
++   same "printed page" as the copyright notice for easier
++   identification within third-party archives.
++
++Copyright [yyyy] [name of copyright owner]
++
++Licensed under the Apache License, Version 2.0 (the "License");
++you may not use this file except in compliance with the License.
++You may obtain a copy of the License at
++
++	http://www.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++See the License for the specific language governing permissions and
++limitations under the License.
+diff --git a/LICENSE-MIT b/LICENSE-MIT
+new file mode 100644
+index 0000000..290e7b9
+--- /dev/null
++++ b/LICENSE-MIT
+@@ -0,0 +1,25 @@
++Copyright (c) 2017 Pierre Chifflier
++
++Permission is hereby granted, free of charge, to any
++person obtaining a copy of this software and associated
++documentation files (the "Software"), to deal in the
++Software without restriction, including without
++limitation the rights to use, copy, modify, merge,
++publish, distribute, sublicense, and/or sell copies of
++the Software, and to permit persons to whom the Software
++is furnished to do so, subject to the following
++conditions:
++
++The above copyright notice and this permission notice
++shall be included in all copies or substantial portions
++of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
++TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
++SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
++IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++DEALINGS IN THE SOFTWARE.
diff --git a/src/lib.rs b/src/lib.rs
index c6f4bde..afac8c2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,47 +1,4 @@
-extern crate proc_macro;
-
 use proc_macro::TokenStream;
-fn parse_arg(arg: &str) -> (bool, bool, Vec<&str>) {
-    use nom::{
-        bytes::complete::{tag, take_while},
-        call,
-        character::complete::{char, digit1},
-        combinator::{map, opt, recognize, verify},
-        error::{ErrorKind, ParseError},
-        exact,
-        multi::separated_list1,
-        sequence::{delimited, terminated, tuple},
-        IResult,
-    };
-
-    fn uint<'a, E: ParseError<&'a str>>(i: &'a str) -> IResult<&'a str, &'a str, E> {
-        verify(recognize(separated_list1(char('_'), digit1)), |s: &str| {
-            s.len() == 1 || !s.starts_with('0')
-        })(i)
-    }
-
-    fn ws<'a, E: ParseError<&'a str>>(i: &'a str) -> IResult<&'a str, &'a str, E> {
-        take_while(|c| c == ' ')(i)
-    }
-
-    fn ws_dot_ws<'a, E: ParseError<&'a str>>(i: &'a str) -> IResult<&'a str, char, E> {
-        delimited(ws, char('.'), ws)(i)
-    }
-
-    fn root<'a, E: ParseError<&'a str>>(
-        i: &'a str,
-    ) -> IResult<&'a str, (bool, bool, Vec<&'a str>), E> {
-        tuple((
-            map(opt(terminated(tag("raw "), ws)), |x| x.is_some()),
-            map(opt(terminated(tag("rel "), ws)), |x| x.is_some()),
-            separated_list1(ws_dot_ws, uint),
-        ))(i)
-    }
-
-    exact!(arg.trim(), call!(root::<(&str, ErrorKind)>))
-        .expect("could not parse oid")
-        .1
-}
 
 fn encode_components(components: &[num_bigint::BigUint], relative: bool) -> Vec<u8> {
     use num_traits::cast::ToPrimitive;
@@ -106,13 +63,21 @@ fn encode_components(components: &[num_bigint::BigUint], relative: bool) -> Vec<
 }
 
 #[proc_macro]
-pub fn oid(item: TokenStream) -> TokenStream {
-    let arg = item.to_string();
-    let (raw, relative, int_strings) = parse_arg(&arg);
-    let ints: Vec<num_bigint::BigUint> = int_strings
-        .into_iter()
+pub fn encode_oid(input: TokenStream) -> TokenStream {
+    let s = input.to_string();
+
+    let (rem, relative) = if s.starts_with("rel ") {
+        (&s[4..], true)
+    } else {
+        (s.as_ref(), false)
+    };
+
+    let ints: Vec<num_bigint::BigUint> = rem
+        .split('.')
+        .map(|segment| segment.trim())
         .map(|s| s.parse().unwrap())
         .collect();
+
     let enc = encode_components(&ints, relative);
 
     let mut s = String::with_capacity(2 + 6 * enc.len());
@@ -121,19 +86,5 @@ pub fn oid(item: TokenStream) -> TokenStream {
         s.insert_str(s.len(), &format!("0x{:02x}, ", byte));
     }
     s.push(']');
-
-    let code = if raw {
-        s
-    } else if relative {
-        format!(
-            "der_parser::oid::Oid::new_relative(std::borrow::Cow::Borrowed(&{}))",
-            s
-        )
-    } else {
-        format!(
-            "der_parser::oid::Oid::new(std::borrow::Cow::Borrowed(&{}))",
-            s
-        )
-    };
-    code.parse().unwrap()
+    s.parse().unwrap()
 }