diff --git a/.github/workflows/ecb.yml b/.github/workflows/ecb.yml new file mode 100644 index 0000000..af7c4e0 --- /dev/null +++ b/.github/workflows/ecb.yml @@ -0,0 +1,59 @@ +name: ecb + +on: + pull_request: + paths: + - ".github/workflows/ecb.yml" + - "ecb/**" + - "Cargo.*" + push: + branches: master + +defaults: + run: + working-directory: ecb + +env: + CARGO_INCREMENTAL: 0 + RUSTFLAGS: "-Dwarnings" + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + rust: + - 1.85.0 # MSRV + - stable + target: + - thumbv7em-none-eabi + - wasm32-unknown-unknown + steps: + - uses: actions/checkout@v4 + - uses: RustCrypto/actions/cargo-cache@master + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.rust }} + targets: ${{ matrix.target }} + - run: cargo build --no-default-features --release --target ${{ matrix.target }} + + minimal-versions: + uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master + with: + working-directory: ${{ github.workflow }} + + test: + runs-on: ubuntu-latest + strategy: + matrix: + rust: + - 1.85.0 # MSRV + - stable + steps: + - uses: actions/checkout@v4 + - uses: RustCrypto/actions/cargo-cache@master + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.rust }} + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b790096..090dcbc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,6 +8,7 @@ on: 'cfb8-v*', 'ctr-v*', 'cts-v*', + 'ecb-v*', 'ige-v*', 'ofb-v*', 'pcbc-v*', diff --git a/Cargo.lock b/Cargo.lock index 3ade1ee..1b5a135 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "aes" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8" +checksum = "f8eb277bec05f56a0e0591f155a484cbd0f4f07ff2905051a48c72f004f7ed58" dependencies = [ "cipher", "cpubits", @@ -39,9 +39,9 @@ checksum = "89af0b093cc13baa4e51e64e65ec2422f7e73aea0e612e5ad3872986671622f1" [[package]] name = "block-buffer" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ "hybrid-array", "zeroize", @@ -148,6 +148,15 @@ dependencies = [ "hex-literal", ] +[[package]] +name = "ecb" +version = "0.2.0" +dependencies = [ + "aes", + "cipher", + "hex-literal", +] + [[package]] name = "hex-literal" version = "1.1.0" @@ -156,9 +165,9 @@ checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" [[package]] name = "hybrid-array" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" +checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b" dependencies = [ "typenum", "zeroize", @@ -195,9 +204,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.186" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "magma" @@ -228,12 +237,12 @@ dependencies = [ [[package]] name = "typenum" -version = "1.20.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" diff --git a/Cargo.toml b/Cargo.toml index dd1b9eb..5d45094 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,11 @@ resolver = "3" members = [ "belt-ctr", "cbc", - "cts", - "cfb8", "cfb-mode", + "cfb8", "ctr", + "cts", + "ecb", "ige", "ofb", "pcbc" diff --git a/ecb/CHANGELOG.md b/ecb/CHANGELOG.md new file mode 100644 index 0000000..8bd5238 --- /dev/null +++ b/ecb/CHANGELOG.md @@ -0,0 +1,19 @@ +# 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). + +## 0.2.1 (UNRELEASED) +### Changed +- Crate was moved to the [RustCrypto/block-modes] repository ([#118]) + +[#118]: https://github.com/RustCrypto/block-modes/pull/118 +[RustCrypto/block-modes]: https://github.com/RustCrypto/block-modes + +## 0.2.0 (2026-04-10) +### Changed +- Bump `cipher` from `0.4` to `0.5` +- Edition changed to 2024 and MSRV bumped to 1.85 +- Relax MSRV policy and allow MSRV bumps in patch releases diff --git a/ecb/Cargo.toml b/ecb/Cargo.toml new file mode 100644 index 0000000..4491ddc --- /dev/null +++ b/ecb/Cargo.toml @@ -0,0 +1,33 @@ +[package] +name = "ecb" +version = "0.2.0" +authors = ["RustCrypto Developers"] +edition = "2024" +rust-version = "1.85" +documentation = "https://docs.rs/ecb" +readme = "README.md" +repository = "https://github.com/RustCrypto/block-modes" +license = "MIT OR Apache-2.0" +keywords = ["crypto", "block-mode", "ciphers"] +categories = ["cryptography", "no-std"] +description = "Generic implementation of the ECB (Electronic Codebook) block cipher mode of operation" + +[dependencies] +cipher = "0.5" + +[dev-dependencies] +cipher = { version = "0.5", features = ["dev"] } +hex-literal = "1" +aes = "0.9" + +[features] +default = ["block-padding"] +alloc = ["cipher/alloc"] +block-padding = ["cipher/block-padding"] +zeroize = ["cipher/zeroize"] + +[lints] +workspace = true + +[package.metadata.docs.rs] +all-features = true diff --git a/ecb/LICENSE-APACHE b/ecb/LICENSE-APACHE new file mode 100644 index 0000000..78173fa --- /dev/null +++ b/ecb/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/ecb/LICENSE-MIT b/ecb/LICENSE-MIT new file mode 100644 index 0000000..3b4cbed --- /dev/null +++ b/ecb/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2026 RustCrypto 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/ecb/README.md b/ecb/README.md new file mode 100644 index 0000000..603ca69 --- /dev/null +++ b/ecb/README.md @@ -0,0 +1,45 @@ +# RustCrypto: ECB + +[![crate][crate-image]][crate-link] +[![Docs][docs-image]][docs-link] +![MIT licensed][license-image] +![Rust Version][rustc-image] +[![Build Status][build-image]][build-link] + +Generic implementation of the [Electronic Codebook][ECB] (CBC) block cipher +mode of operation. + + + +See [documentation][cipher-doc] of the `cipher` crate for additional information. + +## 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://img.shields.io/crates/v/ecb.svg +[crate-link]: https://crates.io/crates/ecb +[docs-image]: https://docs.rs/ecb/badge.svg +[docs-link]: https://docs.rs/ecb/ +[license-image]: https://img.shields.io/badge/license-MIT-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.85+-blue.svg +[build-image]: https://github.com/magic-akari/ecb/actions/workflows/test.yml/badge.svg?branch=main +[build-link]: https://github.com/magic-akari/ecb/actions/workflows/test.yml + +[//]: # (general links) + +[ECB]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#ECB +[cipher-doc]: https://docs.rs/cipher diff --git a/ecb/src/decrypt.rs b/ecb/src/decrypt.rs new file mode 100644 index 0000000..0b6bbff --- /dev/null +++ b/ecb/src/decrypt.rs @@ -0,0 +1,146 @@ +use cipher::{ + AlgorithmName, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, + BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InOut, InOutBuf, + ParBlocks, ParBlocksSizeUser, + array::ArraySize, + common::{InnerInit, InnerUser}, +}; +use core::fmt; + +/// ECB mode decryptor. +#[derive(Clone)] +pub struct Decryptor +where + C: BlockCipherDecrypt, +{ + cipher: C, +} + +impl BlockSizeUser for Decryptor +where + C: BlockCipherDecrypt, +{ + type BlockSize = C::BlockSize; +} + +impl BlockModeDecrypt for Decryptor +where + C: BlockCipherDecrypt, +{ + fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure) { + let Self { cipher } = self; + cipher.decrypt_with_backend(Closure { f }); + } +} + +impl InnerUser for Decryptor +where + C: BlockCipherDecrypt, +{ + type Inner = C; +} + +impl InnerInit for Decryptor +where + C: BlockCipherDecrypt, +{ + #[inline] + fn inner_init(cipher: C) -> Self { + Self { cipher } + } +} + +impl AlgorithmName for Decryptor +where + C: BlockCipherDecrypt + AlgorithmName, +{ + fn write_alg_name(f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str("ecb::Decryptor<")?; + ::write_alg_name(f)?; + f.write_str(">") + } +} + +impl fmt::Debug for Decryptor +where + C: BlockCipherDecrypt + AlgorithmName, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str("ecb::Decryptor<")?; + ::write_alg_name(f)?; + f.write_str("> { ... }") + } +} + +struct Closure +where + BS: ArraySize, + BC: BlockModeDecClosure, +{ + f: BC, +} + +impl BlockSizeUser for Closure +where + BS: ArraySize, + BC: BlockModeDecClosure, +{ + type BlockSize = BS; +} + +impl BlockCipherDecClosure for Closure +where + BS: ArraySize, + BC: BlockModeDecClosure, +{ + #[inline(always)] + fn call>(self, cipher_backend: &B) { + let Self { f } = self; + f.call(&mut Backend { cipher_backend }); + } +} + +struct Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherDecBackend, +{ + cipher_backend: &'a BK, +} + +impl<'a, BS, BK> BlockSizeUser for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherDecBackend, +{ + type BlockSize = BS; +} + +impl<'a, BS, BK> ParBlocksSizeUser for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherDecBackend, +{ + type ParBlocksSize = BK::ParBlocksSize; +} + +impl<'a, BS, BK> BlockModeDecBackend for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherDecBackend, +{ + #[inline(always)] + fn decrypt_block(&mut self, block: InOut<'_, '_, Block>) { + self.cipher_backend.decrypt_block(block); + } + + #[inline(always)] + fn decrypt_par_blocks(&mut self, blocks: InOut<'_, '_, ParBlocks>) { + self.cipher_backend.decrypt_par_blocks(blocks); + } + + #[inline(always)] + fn decrypt_tail_blocks(&mut self, blocks: InOutBuf<'_, '_, Block>) { + self.cipher_backend.decrypt_tail_blocks(blocks); + } +} diff --git a/ecb/src/encrypt.rs b/ecb/src/encrypt.rs new file mode 100644 index 0000000..4679559 --- /dev/null +++ b/ecb/src/encrypt.rs @@ -0,0 +1,146 @@ +use cipher::{ + AlgorithmName, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, + BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InOutBuf, + ParBlocks, ParBlocksSizeUser, + array::ArraySize, + common::{InnerInit, InnerUser}, +}; +use core::fmt; + +/// ECB mode encryptor. +#[derive(Clone)] +pub struct Encryptor +where + C: BlockCipherEncrypt, +{ + cipher: C, +} + +impl BlockSizeUser for Encryptor +where + C: BlockCipherEncrypt, +{ + type BlockSize = C::BlockSize; +} + +impl BlockModeEncrypt for Encryptor +where + C: BlockCipherEncrypt, +{ + fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure) { + let Self { cipher } = self; + cipher.encrypt_with_backend(Closure { f }); + } +} + +impl InnerUser for Encryptor +where + C: BlockCipherEncrypt, +{ + type Inner = C; +} + +impl InnerInit for Encryptor +where + C: BlockCipherEncrypt, +{ + #[inline] + fn inner_init(cipher: C) -> Self { + Self { cipher } + } +} + +impl AlgorithmName for Encryptor +where + C: BlockCipherEncrypt + AlgorithmName, +{ + fn write_alg_name(f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str("ecb::Encryptor<")?; + ::write_alg_name(f)?; + f.write_str(">") + } +} + +impl fmt::Debug for Encryptor +where + C: BlockCipherEncrypt + AlgorithmName, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.write_str("ecb::Encryptor<")?; + ::write_alg_name(f)?; + f.write_str("> { ... }") + } +} + +struct Closure +where + BS: ArraySize, + BC: BlockModeEncClosure, +{ + f: BC, +} + +impl BlockSizeUser for Closure +where + BS: ArraySize, + BC: BlockModeEncClosure, +{ + type BlockSize = BS; +} + +impl BlockCipherEncClosure for Closure +where + BS: ArraySize, + BC: BlockModeEncClosure, +{ + #[inline(always)] + fn call>(self, cipher_backend: &B) { + let Self { f } = self; + f.call(&mut Backend { cipher_backend }); + } +} + +struct Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherEncBackend, +{ + cipher_backend: &'a BK, +} + +impl<'a, BS, BK> BlockSizeUser for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherEncBackend, +{ + type BlockSize = BS; +} + +impl<'a, BS, BK> ParBlocksSizeUser for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherEncBackend, +{ + type ParBlocksSize = BK::ParBlocksSize; +} + +impl<'a, BS, BK> BlockModeEncBackend for Backend<'a, BS, BK> +where + BS: ArraySize, + BK: BlockCipherEncBackend, +{ + #[inline(always)] + fn encrypt_block(&mut self, block: InOut<'_, '_, Block>) { + self.cipher_backend.encrypt_block(block); + } + + #[inline(always)] + fn encrypt_par_blocks(&mut self, blocks: InOut<'_, '_, ParBlocks>) { + self.cipher_backend.encrypt_par_blocks(blocks); + } + + #[inline(always)] + fn encrypt_tail_blocks(&mut self, blocks: InOutBuf<'_, '_, Block>) { + self.cipher_backend.encrypt_tail_blocks(blocks); + } +} diff --git a/ecb/src/lib.rs b/ecb/src/lib.rs new file mode 100644 index 0000000..c340ed7 --- /dev/null +++ b/ecb/src/lib.rs @@ -0,0 +1,98 @@ +//! [Electronic Codebook][1] (ECB) mode. +//! +//! +//! +//! +//! Mode functionality is accessed using traits from re-exported [`cipher`] crate. +//! +//! # ⚠️ Security Warning: Hazmat! +//! +//! This crate does not ensure ciphertexts are authentic! Thus ciphertext integrity +//! is not verified, which can lead to serious vulnerabilities! +//! +//! # Example +//! ``` +//! # #[cfg(feature = "block-padding")] { +//! use aes::cipher::{block_padding::Pkcs7, BlockModeDecrypt, BlockModeEncrypt, KeyInit}; +//! use hex_literal::hex; +//! +//! type Aes128EcbEnc = ecb::Encryptor; +//! type Aes128EcbDec = ecb::Decryptor; +//! +//! let key = [0x42; 16]; +//! let plaintext = *b"hello world! this is my plaintext."; +//! let ciphertext = hex!( +//! "42b153410851a931eb3e6c048867ae5f" +//! "95eb20b42e176b07840db75688be9c70" +//! "e4670ea0d87a71be5f9f3099b4fff3dc" +//! ); +//! +//! // encrypt/decrypt in-place +//! // buffer must be big enough for padded plaintext +//! let mut buf = [0u8; 48]; +//! let pt_len = plaintext.len(); +//! buf[..pt_len].copy_from_slice(&plaintext); +//! let ct = Aes128EcbEnc::new(&key.into()) +//! .encrypt_padded::(&mut buf, pt_len) +//! .unwrap(); +//! assert_eq!(ct, &ciphertext[..]); +//! +//! let pt = Aes128EcbDec::new(&key.into()) +//! .decrypt_padded::(&mut buf) +//! .unwrap(); +//! assert_eq!(pt, &plaintext); +//! +//! // encrypt/decrypt from buffer to buffer +//! let mut buf = [0u8; 48]; +//! let ct = Aes128EcbEnc::new(&key.into()) +//! .encrypt_padded_b2b::(&plaintext, &mut buf) +//! .unwrap(); +//! assert_eq!(ct, &ciphertext[..]); +//! +//! let mut buf = [0u8; 48]; +//! let pt = Aes128EcbDec::new(&key.into()) +//! .decrypt_padded_b2b::(&ct, &mut buf) +//! .unwrap(); +//! assert_eq!(pt, &plaintext); +//! # } +//! ``` +//! +//! With enabled `alloc` feature you also can use allocating convenience methods: +//! ``` +//! # #[cfg(all(feature = "alloc", feature = "block-padding"))] { +//! # use aes::cipher::{block_padding::Pkcs7, BlockModeDecrypt, BlockModeEncrypt, KeyInit}; +//! # use hex_literal::hex; +//! # type Aes128EcbEnc = ecb::Encryptor; +//! # type Aes128EcbDec = ecb::Decryptor; +//! # let key = [0x42; 16]; +//! # let plaintext = *b"hello world! this is my plaintext."; +//! # let ciphertext = hex!( +//! # "42b153410851a931eb3e6c048867ae5f" +//! # "95eb20b42e176b07840db75688be9c70" +//! # "e4670ea0d87a71be5f9f3099b4fff3dc" +//! # ); +//! let res = Aes128EcbEnc::new(&key.into()) +//! .encrypt_padded_vec::(&plaintext); +//! assert_eq!(res[..], ciphertext[..]); +//! let res = Aes128EcbDec::new(&key.into()) +//! .decrypt_padded_vec::(&res) +//! .unwrap(); +//! assert_eq!(res[..], plaintext[..]); +//! # } +//! ``` +//! +//! [1]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#ECB + +#![no_std] +#![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" +)] +#![cfg_attr(docsrs, feature(doc_cfg))] + +mod decrypt; +mod encrypt; + +pub use cipher; +pub use decrypt::Decryptor; +pub use encrypt::Encryptor; diff --git a/ecb/tests/aes_cavp.rs b/ecb/tests/aes_cavp.rs new file mode 100644 index 0000000..c94af42 --- /dev/null +++ b/ecb/tests/aes_cavp.rs @@ -0,0 +1,131 @@ +//! Test vectors from CAVP "AES Multiblock Message Test (MMT) Sample Vectors": +//! +use aes::*; +use cipher::{BlockModeDecrypt, BlockModeEncrypt, InOutBuf, KeyInit}; +use ecb::{Decryptor, Encryptor}; + +const MAX_LEN: usize = 256; + +#[derive(Debug, Clone, Copy)] +struct TestVector { + pub key: &'static [u8], + pub plaintext: &'static [u8], + pub ciphertext: &'static [u8], +} + +#[test] +fn aes128_ecb_cavp() { + cipher::dev::blobby::parse_into_structs!( + include_bytes!("data/aes128.blb"); + static TEST_VECTORS: &[TestVector { key, plaintext, ciphertext }]; + ); + + for tv in TEST_VECTORS.iter() { + encrypt::>(tv).unwrap(); + encrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + } +} + +#[test] +fn aes192_ecb_cavp() { + cipher::dev::blobby::parse_into_structs!( + include_bytes!("data/aes192.blb"); + static TEST_VECTORS: &[TestVector { key, plaintext, ciphertext }]; + ); + + for tv in TEST_VECTORS.iter() { + encrypt::>(tv).unwrap(); + encrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + } +} + +#[test] +fn aes256_ecb_cavp() { + cipher::dev::blobby::parse_into_structs!( + include_bytes!("data/aes256.blb"); + static TEST_VECTORS: &[TestVector { key, plaintext, ciphertext }]; + ); + + for tv in TEST_VECTORS.iter() { + encrypt::>(tv).unwrap(); + encrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + decrypt::>(tv).unwrap(); + } +} + +fn encrypt(tv: &TestVector) -> Result<(), &'static str> { + let mut buf = [0u8; MAX_LEN]; + let Some(out) = buf.get_mut(..tv.ciphertext.len()) else { + return Err("ciphertext is bigger than MAX_MSG_LEN bytes"); + }; + let Ok(mut buf) = InOutBuf::new(tv.plaintext, out) else { + return Err("plaintext/ciphertext length mismatch"); + }; + let (blocks, tail) = buf.reborrow().into_chunks(); + if !tail.is_empty() { + return Err("plaintext/ciphertext length is not multiple of block size"); + } + + let Ok(mut cipher) = C::new_from_slice(tv.key) else { + return Err("cipher initialization failure"); + }; + for block in blocks { + cipher.encrypt_block_inout(block); + } + if buf.get_out() != tv.ciphertext { + return Err("single block encryption failure"); + } + + // test multi-block processing + let Ok(mut cipher) = C::new_from_slice(tv.key) else { + return Err("cipher initialization failure"); + }; + buf.get_out().fill(0); + let (blocks, _) = buf.reborrow().into_chunks(); + cipher.encrypt_blocks_inout(blocks); + if buf.get_out() != tv.ciphertext { + return Err("multi-block encryption failure"); + } + Ok(()) +} + +fn decrypt(tv: &TestVector) -> Result<(), &'static str> { + let mut buf = [0u8; MAX_LEN]; + let Some(out) = buf.get_mut(..tv.plaintext.len()) else { + return Err("plaintext is bigger than MAX_MSG_LEN bytes"); + }; + let Ok(mut buf) = InOutBuf::new(tv.ciphertext, out) else { + return Err("plaintext/ciphertext length mismatch"); + }; + let (blocks, tail) = buf.reborrow().into_chunks(); + if !tail.is_empty() { + return Err("plaintext/ciphertext length is not multiple of block size"); + } + + let Ok(mut cipher) = C::new_from_slice(tv.key) else { + return Err("cipher initialization failure"); + }; + for block in blocks { + cipher.decrypt_block_inout(block); + } + if buf.get_out() != tv.plaintext { + return Err("single block decryption failure"); + } + + // test multi-block processing + let Ok(mut cipher) = C::new_from_slice(tv.key) else { + return Err("cipher initialization failure"); + }; + buf.get_out().fill(0); + let (blocks, _) = buf.reborrow().into_chunks(); + cipher.decrypt_blocks_inout(blocks); + if buf.get_out() != tv.plaintext { + return Err("multi-block decryption failure"); + } + Ok(()) +} diff --git a/ecb/tests/data/aes128.blb b/ecb/tests/data/aes128.blb new file mode 100644 index 0000000..3645e01 Binary files /dev/null and b/ecb/tests/data/aes128.blb differ diff --git a/ecb/tests/data/aes192.blb b/ecb/tests/data/aes192.blb new file mode 100644 index 0000000..1c21cae Binary files /dev/null and b/ecb/tests/data/aes192.blb differ diff --git a/ecb/tests/data/aes256.blb b/ecb/tests/data/aes256.blb new file mode 100644 index 0000000..8810cbb Binary files /dev/null and b/ecb/tests/data/aes256.blb differ