From ac85a7c6bcfbb355d65261e1baa676a0f283638a Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Wed, 28 Apr 2021 15:09:19 -0700 Subject: [PATCH 1/2] cipher v0.3.0 --- Cargo.lock | 46 +++++++++++++++++++++++++++++-------------- cipher/CHANGELOG.md | 18 +++++++++++++++++ cipher/Cargo.toml | 2 +- crypto-mac/Cargo.toml | 4 ++-- crypto/Cargo.toml | 9 ++++----- crypto/src/lib.rs | 2 -- 6 files changed, 56 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 255b405a7..e541e1150 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "aead" version = "0.4.0" @@ -51,9 +49,9 @@ checksum = "d0d27fb6b6f1e43147af148af49d49329413ba781aa0d5e10979831c210173b5" [[package]] name = "bitvec" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ "funty", "radium", @@ -109,7 +107,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.3.0-pre.5" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array 0.14.4", +] + +[[package]] +name = "cipher" +version = "0.4.0-pre" dependencies = [ "blobby", "block-buffer 0.10.0-pre.4", @@ -120,9 +127,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af497ba993c3f3c416a0e1e1d84b81c3e0b131c4c67105a391920ba4dfa24d2d" +checksum = "279bc8fc53f788a75c7804af68237d1fce02cde1e275a886a4b320604dc2aeda" [[package]] name = "cpuid-bool" @@ -135,10 +142,9 @@ name = "crypto" version = "0.2.0-pre" dependencies = [ "aead", - "cipher", - "crypto-common", - "crypto-mac", - "digest 0.10.0-pre.3", + "cipher 0.3.0", + "crypto-mac 0.11.0", + "digest 0.9.0", "elliptic-curve", "password-hash", "signature", @@ -155,10 +161,20 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.0-pre.1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" +dependencies = [ + "generic-array 0.14.4", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.12.0-pre" dependencies = [ "blobby", - "cipher", + "cipher 0.4.0-pre", "crypto-common", "generic-array 0.14.4", "rand_core", @@ -460,9 +476,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" dependencies = [ "proc-macro2", "quote", diff --git a/cipher/CHANGELOG.md b/cipher/CHANGELOG.md index e7743e965..2c86e4876 100644 --- a/cipher/CHANGELOG.md +++ b/cipher/CHANGELOG.md @@ -5,6 +5,24 @@ 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.3.0 (2021-04-29) +### Added +- Encrypt/decrypt-only block cipher traits ([#352]) +- Re-export `blobby` from root ([#435]) +- Block cipher trait blanket impls for refs ([#441]) + +### Changed +- Consolidate error types ([#373]) +- Change `SeekNum` impls to fit with the new `BlockBuffer` ([#435]) +- Reorganize modules ([#435]) +- Renamed `new_var` to `new_from_slice(s)` ([#442]) + +[#352]: https://github.com/RustCrypto/traits/pull/352 +[#373]: https://github.com/RustCrypto/traits/pull/373 +[#435]: https://github.com/RustCrypto/traits/pull/435 +[#441]: https://github.com/RustCrypto/traits/pull/441 +[#442]: https://github.com/RustCrypto/traits/pull/442 + ## 0.2.5 (2020-11-01) ### Fixed - Nested macros used old deprecated names ([#360]) diff --git a/cipher/Cargo.toml b/cipher/Cargo.toml index c53cdca00..803b017eb 100644 --- a/cipher/Cargo.toml +++ b/cipher/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cipher" description = "Traits for describing block ciphers and stream ciphers" -version = "0.3.0-pre.5" +version = "0.4.0-pre" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/crypto-mac/Cargo.toml b/crypto-mac/Cargo.toml index bb04f65de..259c6bdb2 100644 --- a/crypto-mac/Cargo.toml +++ b/crypto-mac/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crypto-mac" description = "Trait for Message Authentication Code (MAC) algorithms" -version = "0.11.0-pre.1" +version = "0.12.0-pre" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"] [dependencies] generic-array = "0.14" crypto-common = { version = "=0.1.0-pre", path = "../crypto-common" } -cipher = { version = "=0.3.0-pre.5", path = "../cipher" } +cipher = { version = "=0.4.0-pre", path = "../cipher" } subtle = { version = "2", default-features = false } blobby = { version = "0.3", optional = true } diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index d88c09398..63fe856bf 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -13,13 +13,12 @@ edition = "2018" [dependencies] aead = { version = "0.4", optional = true, path = "../aead" } -cipher = { version = "=0.3.0-pre.5", optional = true, path = "../cipher" } -common = { version = "=0.1.0-pre", package = "crypto-common", path = "../crypto-common" } -digest = { version = "0.10.0-pre", optional = true, path = "../digest" } +cipher = { version = "0.3", optional = true } +digest = { version = "0.9", optional = true } elliptic-curve = { version = "0.9", optional = true, path = "../elliptic-curve" } -mac = { version = "=0.11.0-pre.1", package = "crypto-mac", optional = true, path = "../crypto-mac" } +mac = { version = "0.11", package = "crypto-mac", optional = true } password-hash = { version = "=0.2.0-pre", optional = true, path = "../password-hash" } -signature = { version = "1.3.0", optional = true, default-features = false, path = "../signature" } +signature = { version = "1.2.0", optional = true, default-features = false, path = "../signature" } universal-hash = { version = "0.4", optional = true, path = "../universal-hash" } [features] diff --git a/crypto/src/lib.rs b/crypto/src/lib.rs index cc11a12aa..b52b4b9f9 100644 --- a/crypto/src/lib.rs +++ b/crypto/src/lib.rs @@ -43,8 +43,6 @@ #![forbid(unsafe_code)] #![warn(rust_2018_idioms)] -pub use common; - #[cfg(feature = "aead")] pub use aead; From cfde4de85078518800c71069f628eeab18aebf23 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Wed, 28 Apr 2021 15:14:21 -0700 Subject: [PATCH 2/2] crypto-mac v0.11.0 --- cipher/CHANGELOG.md | 2 +- crypto-mac/CHANGELOG.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cipher/CHANGELOG.md b/cipher/CHANGELOG.md index 2c86e4876..426cc83c6 100644 --- a/cipher/CHANGELOG.md +++ b/cipher/CHANGELOG.md @@ -5,7 +5,7 @@ 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.3.0 (2021-04-29) +## 0.3.0 (2021-04-28) ### Added - Encrypt/decrypt-only block cipher traits ([#352]) - Re-export `blobby` from root ([#435]) diff --git a/crypto-mac/CHANGELOG.md b/crypto-mac/CHANGELOG.md index 9d4f0b24c..d63daa7b7 100644 --- a/crypto-mac/CHANGELOG.md +++ b/crypto-mac/CHANGELOG.md @@ -5,6 +5,12 @@ 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.11.0 (2021-04-28) +### Changed +- Bump `cipher` dependency to v0.3 ([#621]) + +[#621]: https://github.com/RustCrypto/traits/pull/621 + ## 0.10.0 (2020-10-15) ### Changed - Replace `block-cipher` crate with new `cipher` crate ([#337], [#338])