Merge pull request #444 from webern/release

release
awslabs · Jan 28, 2022 · 126bfcc · 126bfcc
2 parents d9f0cb8 + a10b753
commit 126bfcc
Show file tree

Hide file tree

Showing 9 changed files with 230 additions and 204 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -22,6 +22,18 @@ allow = [
     "Zlib"
 ]
 
+# /~https://github.com/hsivonen/encoding_rs The non-test code that isn't generated from the WHATWG data in this crate is
+# under Apache-2.0 OR MIT. Test code is under CC0.
+[[licenses.clarify]]
+name = "encoding_rs"
+expression = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE-APACHE", hash = 0x18785531 },
+    { path = "LICENSE-MIT", hash = 0xafaec4cb },
+    { path = "LICENSE-WHATWG", hash = 0xbcb87a0c },
+    { path = "COPYRIGHT", hash = 0x39f8ad31 } # this file describes what licenses apply to the sources, and when they apply
+]
+
 [[licenses.clarify]]
 name = "ring"
 expression = "MIT AND ISC AND OpenSSL"
@@ -41,6 +53,11 @@ license-files = [
 multiple-versions = "deny"
 wildcards = "deny"
 
+skip-tree = [
+    # rusoto_signature uses an older version of itoa
+    { name = "rusoto_signature", version = "0.47.0" },
+]
+
 [sources]
 # Deny crates from unknown registries or git repositories.
 unknown-registry = "deny"

diff --git a/tough-kms/CHANGELOG.md b/tough-kms/CHANGELOG.md
@@ -4,6 +4,10 @@ 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.5] - 2022-01-28
+### Changes
+- Update dependencies.
+
 ## [0.3.4] - 2021-10-19
 ### Changes
 - Update dependencies.
@@ -64,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Everything!
 
+[0.3.5]: /~https://github.com/awslabs/tough/compare/tough-kms-v0.3.4...tough-kms-v0.3.5
 [0.3.4]: /~https://github.com/awslabs/tough/compare/tough-kms-v0.3.3...tough-kms-v0.3.4
 [0.3.3]: /~https://github.com/awslabs/tough/compare/tough-kms-v0.3.2...tough-kms-v0.3.3
 [0.3.2]: /~https://github.com/awslabs/tough/compare/tough-kms-v0.3.1...tough-kms-v0.3.2

diff --git a/tough-kms/Cargo.toml b/tough-kms/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tough-kms"
-version = "0.3.4"
+version = "0.3.5"
 description = "Implements AWS KMS as a key source for TUF signing keys"
 authors = ["Shailesh Gothi <gothisg@amazon.com>"]
 license = "MIT OR Apache-2.0"

diff --git a/tough-ssm/CHANGELOG.md b/tough-ssm/CHANGELOG.md
@@ -4,6 +4,10 @@ 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.6.5] - 2022-01-28
+### Changes
+- Update dependencies.
+
 ## [0.6.4] - 2021-10-19
 ### Changes
 - Update dependencies.
@@ -73,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Everything!
 
+[0.6.5]: /~https://github.com/awslabs/tough/compare/tough-ssm-v0.6.4...tough-ssm-v0.6.5
 [0.6.4]: /~https://github.com/awslabs/tough/compare/tough-ssm-v0.6.3...tough-ssm-v0.6.4
 [0.6.3]: /~https://github.com/awslabs/tough/compare/tough-ssm-v0.6.2...tough-ssm-v0.6.3
 [0.6.2]: /~https://github.com/awslabs/tough/compare/tough-ssm-v0.6.1...tough-ssm-v0.6.2

diff --git a/tough-ssm/Cargo.toml b/tough-ssm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tough-ssm"
-version = "0.6.4"
+version = "0.6.5"
 description = "Implements AWS SSM as a key source for TUF signing keys"
 authors = ["Zac Mrowicki <mrowicki@amazon.com>"]
 license = "MIT OR Apache-2.0"

diff --git a/tough/CHANGELOG.md b/tough/CHANGELOG.md
@@ -4,6 +4,15 @@ 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.12.1] - 2022-01-28
+### Fixes
+- ECDSA keys now use the correct keytype name, thanks @flavio [#425]
+
+### Changes
+- Added support for hex-encoded ECDSA keys, thanks @flavio [#426]
+- Updated to snafu 0.7, thanks @shepmaster [#435]
+- Various other dependency updates
+
 ## [0.12.0] - 2021-10-19
 ### Breaking Changes
 - Target names are now specified with a struct, `TargetName`, instead of `String`.
@@ -158,7 +167,8 @@ For changes that require modification of calling code see #120 and #121.
 ### Added
 - Everything!
 
-[Unreleased]: /~https://github.com/awslabs/tough/compare/tough-v0.12.0...HEAD
+[Unreleased]: /~https://github.com/awslabs/tough/compare/tough-v0.12.1...HEAD
+[0.12.1]: /~https://github.com/awslabs/tough/compare/tough-v0.12.0...tough-v0.12.1
 [0.12.0]: /~https://github.com/awslabs/tough/compare/tough-v0.11.3...tough-v0.12.0
 [0.11.3]: /~https://github.com/awslabs/tough/compare/tough-v0.11.2...tough-v0.11.3
 [0.11.2]: /~https://github.com/awslabs/tough/compare/tough-v0.11.1...tough-v0.11.2

diff --git a/tough/Cargo.toml b/tough/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tough"
-version = "0.12.0"
+version = "0.12.1"
 description = "The Update Framework (TUF) repository client"
 authors = ["iliana destroyer of worlds <iweller@amazon.com>"]
 license = "MIT OR Apache-2.0"

diff --git a/tuftool/Cargo.toml b/tuftool/Cargo.toml
@@ -36,9 +36,9 @@ snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] }
 structopt = "0.3"
 tempfile = "3.3.0"
 tokio = "~1.8"  # LTS
-tough = { version = "0.12.0", path = "../tough", features = ["http"] }
-tough-ssm = { version = "0.6.4", path = "../tough-ssm" }
-tough-kms = { version = "0.3.4", path = "../tough-kms" }
+tough = { version = "0.12.1", path = "../tough", features = ["http"] }
+tough-ssm = { version = "0.6.5", path = "../tough-ssm" }
+tough-kms = { version = "0.3.5", path = "../tough-kms" }
 url = "2.1.0"
 walkdir = "2.3.2"