diff --git a/.github/workflows/ssh-protocol.yml b/.github/workflows/ssh-protocol.yml new file mode 100644 index 0000000..24241d8 --- /dev/null +++ b/.github/workflows/ssh-protocol.yml @@ -0,0 +1,35 @@ +name: ssh-protocol + +on: + pull_request: + paths: + - ".github/workflows/ssh-protocol.yml" + - "ssh-cipher/**" + - "ssh-encoding/**" + - "ssh-key/**" + - "ssh-protocol/**" + - "Cargo.*" + push: + branches: master + +defaults: + run: + working-directory: ssh-protocol + +env: + RUSTFLAGS: "-Dwarnings" + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + rust: + - 1.73.0 # MSRV + - stable + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ matrix.rust }} + - run: cargo test --release diff --git a/Cargo.lock b/Cargo.lock index c1c1af2..ccc271b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -814,6 +814,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ssh-protocol" +version = "0.0.0" +dependencies = [ + "ssh-cipher", + "ssh-encoding", + "ssh-key", +] + [[package]] name = "subtle" version = "2.6.1" diff --git a/Cargo.toml b/Cargo.toml index 94806b6..648aaa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,8 @@ members = [ "ssh-cipher", "ssh-derive", "ssh-encoding", - "ssh-key" + "ssh-key", + "ssh-protocol", ] [profile.dev] diff --git a/README.md b/README.md index b4d6eec..70878cf 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Pure Rust implementation of components of the Secure Shell ([SSH]) protocol. | `ssh‑derive` | [![crates.io](https://img.shields.io/crates/v/ssh-derive.svg)](https://crates.io/crates/ssh-derive) | [![Documentation](https://docs.rs/ssh-derive/badge.svg)](https://docs.rs/ssh-derive) | Custom derive support for `ssh-encoding` | | `ssh‑encoding` | [![crates.io](https://img.shields.io/crates/v/ssh-encoding.svg)](https://crates.io/crates/ssh-encoding) | [![Documentation](https://docs.rs/ssh-encoding/badge.svg)](https://docs.rs/ssh-encoding) | Decoders and encoders for SSH protocol data types | | `ssh‑key` | [![crates.io](https://img.shields.io/crates/v/ssh-key.svg)](https://crates.io/crates/ssh-key) | [![Documentation](https://docs.rs/ssh-key/badge.svg)](https://docs.rs/ssh-key) | SSH key and certificate library with signing support | +| `ssh‑protocol` | [![crates.io](https://img.shields.io/crates/v/ssh-protocol.svg)](https://crates.io/crates/ssh-protocol) | [![Documentation](https://docs.rs/ssh-protocol/badge.svg)](https://docs.rs/ssh-protocol) | SSH protocol implementation (WIP) | ## License diff --git a/ssh-encoding/LICENSE-MIT b/ssh-encoding/LICENSE-MIT index 3294d74..6f139a7 100644 --- a/ssh-encoding/LICENSE-MIT +++ b/ssh-encoding/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2021-2023 The RustCrypto Project Developers +Copyright (c) 2021-2024 The RustCrypto Project Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated diff --git a/ssh-key/README.md b/ssh-key/README.md index 4be5160..0aee9b6 100644 --- a/ssh-key/README.md +++ b/ssh-key/README.md @@ -86,7 +86,7 @@ functionality for a particular SSH key algorithm. ## Minimum Supported Rust Version -This crate requires **Rust 1.65** at a minimum. +This crate requires **Rust 1.73** at a minimum. We may change the MSRV in the future, but it will be accompanied by a minor version bump. @@ -113,7 +113,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/ssh-key/badge.svg [docs-link]: https://docs.rs/ssh-key/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.65+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.73+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/346919-SSH [build-image]: https://github.com/RustCrypto/SSH/actions/workflows/ssh-key.yml/badge.svg diff --git a/ssh-protocol/CHANGELOG.md b/ssh-protocol/CHANGELOG.md new file mode 100644 index 0000000..d6637e0 --- /dev/null +++ b/ssh-protocol/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). diff --git a/ssh-protocol/Cargo.toml b/ssh-protocol/Cargo.toml new file mode 100644 index 0000000..babf70b --- /dev/null +++ b/ssh-protocol/Cargo.toml @@ -0,0 +1,30 @@ +[package] +name = "ssh-protocol" +version = "0.0.0" +description = """ +Pure Rust implementation of the SSH protocol as described in RFC4251/RFC4253 as well as +OpenSSH-specific extensions (WIP) +""" +authors = ["RustCrypto Developers"] +license = "Apache-2.0 OR MIT" +homepage = "https://github.com/RustCrypto/SSH/tree/master/ssh-protocol" +repository = "https://github.com/RustCrypto/SSH" +categories = ["authentication", "cryptography", "encoding", "no-std"] +keywords = ["crypto", "certificate", "openssh", "ssh", "sshsig"] +readme = "README.md" +edition = "2021" +rust-version = "1.73" + +[dependencies] +cipher = { package = "ssh-cipher", version = "=0.3.0-pre", default-features = false, path = "../ssh-cipher" } +encoding = { package = "ssh-encoding", version = "=0.3.0-pre", default-features = false, path = "../ssh-encoding" } +key = { package = "ssh-key", version = "=0.7.0-pre", default-features = false, path = "../ssh-key" } + +[features] +default = ["std"] +alloc = ["encoding/alloc", "key/alloc"] +std = ["alloc", "encoding/std", "key/std"] + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] diff --git a/ssh-protocol/LICENSE-APACHE b/ssh-protocol/LICENSE-APACHE new file mode 100644 index 0000000..78173fa --- /dev/null +++ b/ssh-protocol/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/ssh-protocol/LICENSE-MIT b/ssh-protocol/LICENSE-MIT new file mode 100644 index 0000000..455de7c --- /dev/null +++ b/ssh-protocol/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2024 The RustCrypto Project Developers + +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/ssh-protocol/README.md b/ssh-protocol/README.md new file mode 100644 index 0000000..44f80a4 --- /dev/null +++ b/ssh-protocol/README.md @@ -0,0 +1,56 @@ +# [RustCrypto]: SSH Protocol + +[![crate][crate-image]][crate-link] +[![Docs][docs-image]][docs-link] +[![Build Status][build-image]][build-link] +![Apache2/MIT licensed][license-image] +![Rust Version][rustc-image] +[![Project Chat][chat-image]][chat-link] + +[Documentation][docs-link] + +## About + +Pure Rust implementation of the SSH protocol as described in [RFC4251]/[RFC4253] as well as +OpenSSH-specific extensions (WIP). + +## Minimum Supported Rust Version + +This crate requires **Rust 1.73** at a minimum. + +We may change the MSRV in the future, but it will be accompanied by a minor +version bump. + +## License + +Licensed under either of: + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. + +[//]: # (badges) + +[crate-image]: https://buildstats.info/crate/ssh-protocol +[crate-link]: https://crates.io/crates/ssh-protocol +[docs-image]: https://docs.rs/ssh-protocol/badge.svg +[docs-link]: https://docs.rs/ssh-protocol/ +[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.73+-blue.svg +[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg +[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/346919-SSH +[build-image]: https://github.com/RustCrypto/SSH/actions/workflows/ssh-protocol.yml/badge.svg +[build-link]: https://github.com/RustCrypto/SSH/actions/workflows/ssh-protocol.yml + +[//]: # (links) + +[RustCrypto]: https://github.com/rustcrypto +[RFC4251]: https://datatracker.ietf.org/doc/html/rfc4251 +[RFC4253]: https://datatracker.ietf.org/doc/html/rfc4253 diff --git a/ssh-protocol/src/lib.rs b/ssh-protocol/src/lib.rs new file mode 100644 index 0000000..8dfe4b4 --- /dev/null +++ b/ssh-protocol/src/lib.rs @@ -0,0 +1,29 @@ +#![no_std] +#![cfg_attr(docsrs, feature(doc_auto_cfg))] +#![doc = include_str!("../README.md")] +#![doc( + html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg", + html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg" +)] +#![forbid(unsafe_code)] +#![warn( + clippy::alloc_instead_of_core, + clippy::arithmetic_side_effects, + clippy::mod_module_files, + clippy::panic, + clippy::panic_in_result_fn, + clippy::std_instead_of_alloc, + clippy::std_instead_of_core, + clippy::unwrap_used, + missing_docs, + rust_2018_idioms, + unused_lifetimes, + unused_qualifications +)] + +pub use cipher::{self, Cipher}; +pub use encoding::{self, Decode, Encode, Reader, Writer}; +pub use key::{ + self, certificate::Certificate, private::PrivateKey, public::PublicKey, Algorithm, Fingerprint, + HashAlg, Kdf, KdfAlg, Signature, +};