diff options
author | Yiming Jing <yimingjing@google.com> | 2021-07-20 19:35:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-20 19:35:46 +0000 |
commit | 234624445f184e803c4d6db507a6e4acd0c8da8d (patch) | |
tree | b1b01e37588d23ab73c0e0ea9871f508fd4bfdfd | |
parent | cbade27613410285329091bde8dfde448cf3a7ca (diff) | |
parent | c14a5b0c7d4244d41078c90cc609818c8cd19043 (diff) | |
download | der-oid-macro-234624445f184e803c4d6db507a6e4acd0c8da8d.tar.gz |
Initial import of der-oid-macro-0.4.0 am: b538820ed8 am: c6ced0edfb am: 65ba932980 am: c14a5b0c7d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/1770567
Change-Id: I3390a1ee6f6a3022fd06f5def0b5e9268491f466
-rw-r--r-- | .cargo_vcs_info.json | 5 | ||||
-rw-r--r-- | Cargo.toml | 35 | ||||
-rw-r--r-- | Cargo.toml.orig | 18 | ||||
l--------- | LICENSE | 1 | ||||
-rw-r--r-- | LICENSE-APACHE | 201 | ||||
-rw-r--r-- | LICENSE-MIT | 25 | ||||
-rw-r--r-- | METADATA | 20 | ||||
-rw-r--r-- | MODULE_LICENSE_APACHE2 | 0 | ||||
-rw-r--r-- | OWNERS | 4 | ||||
-rw-r--r-- | src/lib.rs | 139 |
10 files changed, 448 insertions, 0 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..3c083e8 --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,5 @@ +{ + "git": { + "sha1": "ebbea4bd6d42ad878ca2b9cdc53291f4ae19481a" + } +} diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..63b3325 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,35 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# 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 +# +# 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) + +[package] +edition = "2018" +name = "der-oid-macro" +version = "0.4.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" +license = "MIT/Apache-2.0" +repository = "https://github.com/rusticata/der-parser.git" + +[lib] +proc-macro = true +[dependencies.nom] +version = "6.0" + +[dependencies.num-bigint] +version = "0.4" + +[dependencies.num-traits] +version = "0.2" + +[dependencies.syn] +version = "1.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..fbf8a6f --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,18 @@ +[package] +name = "der-oid-macro" +description = "Macro to encode DER oids at compile time" +version = "0.4.0" +edition = "2018" +license = "MIT/Apache-2.0" +homepage = "https://github.com/rusticata/der-parser" +repository = "https://github.com/rusticata/der-parser.git" +authors = ["Pierre Chifflier <chifflier@wzdftpd.net>", "Jannik Schürg <schuerg@ins.uni-bonn.de>"] + +[lib] +proc-macro = true + +[dependencies] +nom = "6.0" +num-bigint = "0.4" +num-traits = "0.2" +syn = "1.0" @@ -0,0 +1 @@ +LICENSE-APACHE
\ No newline at end of file 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/METADATA b/METADATA new file mode 100644 index 0000000..4280ee7 --- /dev/null +++ b/METADATA @@ -0,0 +1,20 @@ +name: "der-oid-macro" +description: "Macro to encode DER oids at compile time" +third_party { + url { + type: HOMEPAGE + value: "https://crates.io/crates/der-oid-macro" + } + url { + type: ARCHIVE + value: "https://static.crates.io/crates/der-oid-macro/der-oid-macro-0.4.0.crate" + } + version: "0.4.0" + # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same. + license_type: NOTICE + last_upgrade_date { + year: 2021 + month: 7 + day: 9 + } +} diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/MODULE_LICENSE_APACHE2 @@ -0,0 +1,4 @@ +include platform/prebuilts/rust:master:/OWNERS +# Android Auto +skeys@google.com +yimingjing@google.com diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..c6f4bde --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,139 @@ +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; + + let mut enc = Vec::new(); + let mut dec = components; + if !relative { + if dec.len() < 2 { + if dec.len() == 1 && dec[0] == 0u8.into() { + return vec![0]; + } + panic!("Need at least two components for non-relative oid"); + } + if dec[0] >= 7u8.into() || dec[1] >= 40u8.into() { + panic!("First components are too big"); + } + enc.push(dec[0].to_u8().unwrap() * 40 + dec[1].to_u8().unwrap()); + dec = &dec[2..]; + } + + for int in dec.iter() { + let mut bytes = int.to_bytes_be(); + if bytes[0] == 0 { + enc.push(0u8); + continue; + } + let total_bits = (8 - bytes[0].leading_zeros()) as usize + (bytes.len() - 1) * 8; + let octects_needed = ((total_bits + 6) / 7).max(1); + enc.resize_with(enc.len() + octects_needed, Default::default); + + let mut pos = enc.len() - 1; + let mut extra = 0u8; + let mut extra_size = 0u8; + bytes.reverse(); + let mut bytes_stored = 0; + for byte in bytes.into_iter() { + if extra_size == 7 { + // there a seven bits in extra + enc[pos] = extra | (1 << 7); + bytes_stored += 1; + pos -= 1; + extra = 0; + extra_size = 0; + } + // make space for the extra bits + enc[pos] = (byte << extra_size) | extra | (1 << 7); + bytes_stored += 1; + if pos > 0 { + pos -= 1; + extra_size += 1; + extra = byte >> (8 - extra_size); + } + } + let last = enc.len() - 1; + if bytes_stored != octects_needed { + let first = last + 1 - octects_needed; + enc[first] = extra | (1 << 7); + } + enc[last] ^= 1 << 7; + } + enc +} + +#[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() + .map(|s| s.parse().unwrap()) + .collect(); + let enc = encode_components(&ints, relative); + + let mut s = String::with_capacity(2 + 6 * enc.len()); + s.push('['); + for byte in enc.iter() { + 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() +} |