From 085777ee9c739895b15b8db17a629826c469facd Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 21 Nov 2023 14:06:43 +0000 Subject: Import asn1-rs-impl crate. Request Document: go/android-rust-importing-crates For CL Reviewers: go/android3p#cl-review For Build Team: go/ab-third-party-imports Bug: 312436741 Test: Treehugger Change-Id: Ie6e96450b8bd28dfaec21f2a9af7d3827af8c2ca --- .cargo_vcs_info.json | 6 ++ Android.bp | 19 +++++ Cargo.toml | 31 ++++++++ Cargo.toml.orig | 17 +++++ LICENSE | 1 + LICENSE-APACHE | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE-MIT | 25 ++++++ METADATA | 20 +++++ MODULE_LICENSE_APACHE2 | 0 OWNERS | 1 + cargo_embargo.json | 3 + src/lib.rs | 126 +++++++++++++++++++++++++++++++ tests/test_oid.rs | 15 ++++ 13 files changed, 465 insertions(+) create mode 100644 .cargo_vcs_info.json create mode 100644 Android.bp create mode 100644 Cargo.toml create mode 100644 Cargo.toml.orig create mode 120000 LICENSE create mode 100644 LICENSE-APACHE create mode 100644 LICENSE-MIT create mode 100644 METADATA create mode 100644 MODULE_LICENSE_APACHE2 create mode 100644 OWNERS create mode 100644 cargo_embargo.json create mode 100644 src/lib.rs create mode 100644 tests/test_oid.rs diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..b1776ad --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,6 @@ +{ + "git": { + "sha1": "78620ca0954d44ddc57d0280d0072dfbd8566de4" + }, + "path_in_vcs": "impl" +} \ No newline at end of file diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..f0404b9 --- /dev/null +++ b/Android.bp @@ -0,0 +1,19 @@ +// This file is generated by cargo_embargo. +// Do not modify this file as changes will be overridden on upgrade. + +// TODO: Add license. +rust_proc_macro { + name: "libasn1_rs_impl", + crate_name: "asn1_rs_impl", + cargo_env_compat: true, + cargo_pkg_version: "0.1.0", + srcs: ["src/lib.rs"], + edition: "2018", + rustlibs: [ + "libproc_macro2", + "libquote", + "libsyn", + ], + product_available: true, + vendor_available: true, +} diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..261b72f --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,31 @@ +# 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 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 = "asn1-rs-impl" +version = "0.1.0" +authors = ["Pierre Chifflier "] +description = "Implementation details for the `asn1-rs` crate" +homepage = "https://github.com/rusticata/asn1-rs" +license = "MIT/Apache-2.0" +repository = "https://github.com/rusticata/asn1-rs.git" + +[lib] +proc-macro = true +[dependencies.proc-macro2] +version = "1" + +[dependencies.quote] +version = "1" + +[dependencies.syn] +version = "1" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..0ed5112 --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,17 @@ +[package] +name = "asn1-rs-impl" +version = "0.1.0" +authors = ["Pierre Chifflier "] +description = "Implementation details for the `asn1-rs` crate" +license = "MIT/Apache-2.0" +homepage = "https://github.com/rusticata/asn1-rs" +repository = "https://github.com/rusticata/asn1-rs.git" +edition = "2018" + +[lib] +proc-macro = true + +[dependencies] +proc-macro2 = "1" +quote = "1" +syn = "1" diff --git a/LICENSE b/LICENSE new file mode 120000 index 0000000..6b579aa --- /dev/null +++ b/LICENSE @@ -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..90e8400 --- /dev/null +++ b/METADATA @@ -0,0 +1,20 @@ +name: "asn1-rs-impl" +description: "Implementation details for the `asn1-rs` crate" +third_party { + identifier { + type: "crates.io" + value: "https://crates.io/crates/asn1-rs-impl" + } + identifier { + type: "Archive" + value: "https://static.crates.io/crates/asn1-rs-impl/asn1-rs-impl-0.1.0.crate" + } + version: "0.1.0" + # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same. + license_type: NOTICE + last_upgrade_date { + year: 2023 + month: 11 + day: 21 + } +} diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..5a2b844 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +include platform/prebuilts/rust:main:/OWNERS diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..fca634f --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,3 @@ +{ + "run_cargo": false +} diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..ea635cc --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,126 @@ +extern crate proc_macro; +use proc_macro::{Span, TokenStream}; +use syn::{parse_macro_input, Error, LitInt}; + +#[proc_macro] +pub fn encode_oid(input: TokenStream) -> TokenStream { + let token_stream = input.to_string(); + let (s, relative) = if token_stream.starts_with("rel ") { + (&token_stream[4..], true) + } else { + (token_stream.as_ref(), false) + }; + let items: Result, _> = s.split('.').map(|x| x.trim().parse::()).collect(); + let mut items: &[_] = match items.as_ref() { + Ok(v) => v.as_ref(), + Err(_) => return create_error("Could not parse OID"), + }; + let mut v = Vec::new(); + if !relative { + if items.len() < 2 { + if items.len() == 1 && items[0] == 0 { + return "[0]".parse().unwrap(); + } + return create_error("Need at least two components for non-relative oid"); + } + if items[0] > 2 || items[1] > 39 { + return create_error("First components are too big"); + } + let first_byte = (items[0] * 40 + items[1]) as u8; + v.push(first_byte); + items = &items[2..]; + } + for &int in items { + let enc = encode_base128(int); + v.extend_from_slice(&enc); + } + // "fn answer() -> u32 { 42 }".parse().unwrap() + let mut s = String::with_capacity(2 + 6 * v.len()); + s.push('['); + for byte in v.iter() { + s.insert_str(s.len(), &format!("0x{:02x}, ", byte)); + } + s.push(']'); + s.parse().unwrap() +} + +#[inline] +fn create_error(msg: &str) -> TokenStream { + let s = format!("Invalid OID({})", msg); + Error::new(Span::call_site().into(), &s) + .to_compile_error() + .into() +} + +// encode int as base128 +fn encode_base128(int: u128) -> Vec { + let mut val = int; + let mut base128 = Vec::new(); + let lo = val & 0x7f; + base128.push(lo as u8); + val >>= 7; + loop { + if val == 0 { + base128.reverse(); + return base128; + } + let lo = val & 0x7f; + base128.push(lo as u8 | 0x80); + val >>= 7; + } +} + +#[proc_macro] +pub fn encode_int(input: TokenStream) -> TokenStream { + let lit = parse_macro_input!(input as LitInt); + + match impl_encode_int(lit) { + Ok(ts) => ts, + Err(e) => e.to_compile_error().into(), + } + + // let token_stream = input.to_string(); + // let items: Result, _> = token_stream + // .split('.') + // .map(|x| x.trim().parse::()) + // .collect(); + // let err = Error::new(Span::call_site().into(), "invalid OID"); + // if let Ok(items) = items { + // let mut v = Vec::new(); + // if items.len() < 2 || items[0] > 2 || items[1] > 39 { + // return err.to_compile_error().into(); + // } + // let first_byte = (items[0] * 40 + items[1]) as u8; + // v.push(first_byte); + // for &int in &items[2..] { + // let enc = encode_base128(int); + // v.extend_from_slice(&enc); + // } + // // "fn answer() -> u32 { 42 }".parse().unwrap() + // let mut s = String::with_capacity(2 + 6 * v.len()); + // s.push('['); + // for byte in v.iter() { + // s.insert_str(s.len(), &format!("0x{:02x}, ", byte)); + // } + // s.push(']'); + // s.parse().unwrap() + // } else { + // eprintln!("could not parse OID '{}'", token_stream); + // err.to_compile_error().into() + // } +} + +fn impl_encode_int(lit: LitInt) -> Result { + let value = lit.base10_parse::()?; + + let bytes = value.to_be_bytes(); + let v: Vec<_> = bytes.iter().skip_while(|&c| *c == 0).collect(); + + let mut s = String::with_capacity(2 + 6 * v.len()); + s.push('['); + for byte in v.iter() { + s.insert_str(s.len(), &format!("0x{:02x}, ", byte)); + } + s.push(']'); + Ok(s.parse().unwrap()) +} diff --git a/tests/test_oid.rs b/tests/test_oid.rs new file mode 100644 index 0000000..b85d622 --- /dev/null +++ b/tests/test_oid.rs @@ -0,0 +1,15 @@ +use asn1_rs_impl::{encode_int, encode_oid}; + +#[test] +fn test_encode_oid() { + // example from http://luca.ntop.org/Teaching/Appunti/asn1.html + let oid = encode_oid! {1.2.840.113549}; + assert_eq!(oid, [0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d]); +} + +#[test] +fn test_encode_int() { + // + let int = encode_int!(1234); + assert_eq!(int, [0x04, 0xd2]); +} -- cgit v1.2.3