Merge branch 'master' into xtea

RustCrypto · Jul 29, 2024 · a97a6b7 · a97a6b7
2 parents e528c73 + e96cb03
commit a97a6b7
Show file tree

Hide file tree

Showing 41 changed files with 1,489 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ members = [
  "cast5",
  "cast6",
  "des",
+ "gift",
  "idea",
  "kuznyechik",
  "magma",

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ It's generally recommended not to use other cipher implementations in this repos
 | [RC5] | [`rc5`] | [![crates.io](https://img.shields.io/crates/v/rc5.svg)](https://crates.io/crates/rc5) | [![Documentation](https://docs.rs/rc5/badge.svg)](https://docs.rs/rc5) | ![MSRV 1.65][msrv-1.65] |
 | [Serpent] | [`serpent`] | [![crates.io](https://img.shields.io/crates/v/serpent.svg)](https://crates.io/crates/serpent) | [![Documentation](https://docs.rs/serpent/badge.svg)](https://docs.rs/serpent) | ![MSRV 1.65][msrv-1.65] |
 | [SM4] | [`sm4`] | [![crates.io](https://img.shields.io/crates/v/sm4.svg)](https://crates.io/crates/sm4) | [![Documentation](https://docs.rs/sm4/badge.svg)](https://docs.rs/sm4) | ![MSRV 1.65][msrv-1.65] |
-| [Speck] | `speck` | [![crates.io](https://img.shields.io/crates/v/speck.svg)](https://crates.io/crates/speck) | [![Documentation](https://docs.rs/speck/badge.svg)](https://docs.rs/speck) | ![MSRV 1.65][msrv-1.65] |
+| [Speck] | [`speck-cipher`] | [![crates.io](https://img.shields.io/crates/v/speck-cipher.svg)](https://crates.io/crates/speck-cipher) | [![Documentation](https://docs.rs/speck-cipher/badge.svg)](https://docs.rs/speck-cipher) | ![MSRV 1.65][msrv-1.65] |
 | [Threefish] | [`threefish`] | [![crates.io](https://img.shields.io/crates/v/threefish.svg)](https://crates.io/crates/threefish) | [![Documentation](https://docs.rs/threefish/badge.svg)](https://docs.rs/threefish) | ![MSRV 1.65][msrv-1.65] |
 | [Twofish] | [`twofish`] | [![crates.io](https://img.shields.io/crates/v/twofish.svg)](https://crates.io/crates/twofish) | [![Documentation](https://docs.rs/twofish/badge.svg)](https://docs.rs/twofish) | ![MSRV 1.65][msrv-1.65] |
 | [XTEA] | [`xtea`] | [![crates.io](https://img.shields.io/crates/v/xtea.svg)](https://crates.io/crates/xtea) | [![Documentation](https://docs.rs/xtea/badge.svg)](https://docs.rs/xtea) | ![MSRV 1.65][msrv-1.65] |
@@ -103,6 +103,7 @@ dual licensed as above, without any additional terms or conditions.
 [`rc5`]: ./rc5
 [`serpent`]: ./serpent
 [`sm4`]: ./sm4
+[`speck-cipher`]: ./speck
 [`threefish`]: ./threefish
 [`twofish`]: ./twofish
 [`xtea`]: ./xtea

diff --git a/aes/Cargo.toml b/aes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aes"
-version = "0.9.0-pre.0"
+version = "0.9.0-pre.1"
 description = "Pure Rust implementation of the Advanced Encryption Standard (a.k.a. Rijndael)"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -14,19 +14,23 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 cfg-if = "1"
-cipher = "=0.5.0-pre.4"
-zeroize = { version = "1.5.6", optional = true, default_features = false, features = ["aarch64"] }
+cipher = "=0.5.0-pre.6"
+zeroize = { version = "1.5.6", optional = true, default-features = false, features = ["aarch64"] }
 
 [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
 cpufeatures = "0.2"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 hex-literal = "0.3"
 
 [features]
 hazmat = [] # Expose cryptographically hazardous APIs
 
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = ["cfg(aes_compact)", "cfg(aes_force_soft)"]
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/aes/src/ni/aes256.rs b/aes/src/ni/aes256.rs
@@ -3,7 +3,7 @@ use crate::{Block, Block8};
 use cipher::inout::InOut;
 use core::mem;
 
-/// AES-192 round keys
+/// AES-256 round keys
 pub(super) type RoundKeys = [__m128i; 15];
 
 #[inline]

diff --git a/aria/Cargo.toml b/aria/Cargo.toml
@@ -13,10 +13,10 @@ keywords = ["crypto", "aria", "block-cipher"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/belt-block/Cargo.toml b/belt-block/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "belt-block"
-version = "0.2.0-pre.0"
+version = "0.2.0-pre.1"
 description = "belt-block block cipher implementation"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -12,10 +12,10 @@ repository = "https://github.com/RustCrypto/block-ciphers"
 keywords = ["crypto", "belt-block", "belt", "stb"]
 
 [dependencies]
-cipher = { version = "=0.5.0-pre.4", optional = true }
+cipher = { version = "=0.5.0-pre.6", optional = true }
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blowfish"
-version = "0.10.0-pre"
+version = "0.10.0-pre.1"
 description = "Blowfish block cipher"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,11 +13,11 @@ keywords = ["crypto", "blowfish", "block-cipher"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 byteorder = { version = "1.1", default-features = false }
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 
 [features]
 bcrypt = []

diff --git a/camellia/Cargo.toml b/camellia/Cargo.toml
@@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 byteorder = { version = "1.1", default-features = false }
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 
 [features]
 zeroize = ["cipher/zeroize"]

diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml
@@ -13,10 +13,10 @@ keywords = ["crypto", "cast5", "block-cipher"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/cast6/Cargo.toml b/cast6/Cargo.toml
@@ -13,10 +13,10 @@ keywords = ["crypto", "cast6", "block-cipher"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/des/Cargo.toml b/des/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "des"
-version = "0.9.0-pre.0"
+version = "0.9.0-pre.1"
 description = "DES and Triple DES (3DES, TDES) block ciphers implementation"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,10 +13,10 @@ keywords = ["crypto", "des", "tdes", "block-cipher"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.4"
+cipher = "=0.5.0-pre.6"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
 
 [features]
 zeroize = ["cipher/zeroize"]

diff --git a/gift/.gitignore b/gift/.gitignore
@@ -0,0 +1 @@
+/target/*
diff --git a/gift/CHANGELOG.md b/gift/CHANGELOG.md
@@ -0,0 +1,9 @@
+# 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.1.0 (2022-08-16)
+- Initial release
diff --git a/gift/Cargo.toml b/gift/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "gift_cipher"
+version = "0.0.1"
+description = "Gift block cipher"
+authors = ["RustCrypto Developers", "Schmid7k"]
+license = "MIT OR Apache-2.0"
+rust-version = "1.56"
+edition = "2021"
+readme = "README.md"
+documentation = "https://docs.rs/gift-cipher"
+repository = "https://github.com/RustCrypto/block-ciphers"
+keywords = ["crypto", "gift", "block-cipher"]
+categories = ["cryptography", "no-std"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cipher = "0.4.3"
+
+[dev-dependencies]
+cipher = { version = "0.4.3", features = ["dev"] }
+criterion = "0.3.5"
+criterion-cycles-per-byte = "0.1.2"
+
+[features]
+zeroize = ["cipher/zeroize"]
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+
+[[bench]]
+name = "gift128enc"
+path = "benches/gift128enc.rs"
+harness = false