Skip to content

Commit

Permalink
Merge pull request #759 from jmt-lab/release/0.17.1
Browse files Browse the repository at this point in the history
Release/0.17.1 Move tough to 0.17.1
  • Loading branch information
jmt-lab authored Mar 26, 2024
2 parents 43d589a + 2aecc0c commit f6d54e9
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 100 deletions.
186 changes: 96 additions & 90 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ skip = [
{ name = "bstr", version = "=0.2" },
# num_cpus and clap is using old versions of hermit-abi
{ name = "hermit-abi" },
# heck duplicates
{ name = "heck", version = "=0.4" },
# the aws rust sdk is using an older version of http
{ name = "http", version = "=0.2" },
# clap and other crates use an old version of syn
Expand Down
11 changes: 10 additions & 1 deletion tough/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ 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.17.1] - 2024-03-22
### Changes
- Adds support for "ecdsa" key type (thanks @jku) [#754]
- Dependency updates [#759]

[#754]: https://github.com/awslabs/tough/issues/754
[#759]: https://github.com/awslabs/tough/pull/759

## [0.17.0] - 2024-03-15
### Fixes
- Fix a bug in ECDSA parsing (thanks @Xynnn007) [#737]
Expand Down Expand Up @@ -260,7 +268,8 @@ For changes that require modification of calling code see #120 and #121.
### Added
- Everything!

[Unreleased]: https://github.com/awslabs/tough/compare/tough-v0.17.0...develop
[Unreleased]: https://github.com/awslabs/tough/compare/tough-v0.17.1...develop
[0.17.1]: https://github.com/awslabs/tough/compare/tough-v0.17.0...tough-v0.17.1
[0.17.0]: https://github.com/awslabs/tough/compare/tough-v0.16.0...tough-v0.17.0
[0.16.0]: https://github.com/awslabs/tough/compare/tough-v0.15.0...tough-v0.16.0
[0.15.0]: https://github.com/awslabs/tough/compare/tough-v0.14.0...tough-v0.15.0
Expand Down
2 changes: 1 addition & 1 deletion tough/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tough"
version = "0.17.0"
version = "0.17.1"
description = "The Update Framework (TUF) repository client"
authors = ["iliana destroyer of worlds <[email protected]>"]
license = "MIT OR Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion tough/src/urlpath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mod test {

let escaped_test_path = encode_filename("a/../b/././c/..");
let traversal_url = url_base.join(&escaped_test_path).expect(&format!(
"Could not create URL from unusual traveral path '{}' + '{}'",
"Could not create URL from unusual traversal path '{}' + '{}'",
url_base.to_string(),
escaped_test_path
));
Expand Down
2 changes: 1 addition & 1 deletion tough/tests/target_path_safety.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async fn create_root(root_path: &Path, consistent_snapshot: bool) -> Vec<Box<dyn
path: test_data().join("snakeoil.pem"),
})];

let key_pair = keys.get(0).unwrap().as_sign().await.unwrap().tuf_key();
let key_pair = keys.first().unwrap().as_sign().await.unwrap().tuf_key();
let key_id = key_pair.key_id().unwrap();

let empty_keys = RoleKeys {
Expand Down
2 changes: 1 addition & 1 deletion tuftool/src/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@ async fn handle_download(
#[test]
fn verify_download_args_cli() {
use clap::CommandFactory;
DownloadArgs::command().debug_assert()
DownloadArgs::command().debug_assert();
}
6 changes: 3 additions & 3 deletions tuftool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,17 @@ impl DelegationCommand {
#[test]
fn verify_program_cli() {
use clap::CommandFactory;
Program::command().debug_assert()
Program::command().debug_assert();
}

#[test]
fn verify_command_cli() {
use clap::CommandFactory;
Command::command().debug_assert()
Command::command().debug_assert();
}

#[test]
fn verify_delegation_cli() {
use clap::CommandFactory;
Delegation::command().debug_assert()
Delegation::command().debug_assert();
}
4 changes: 2 additions & 2 deletions tuftool/src/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ fn test_parse_path_or_url_path_5() {

#[test]
fn test_parse_path_or_url_path_6() {
let input = r#"C:\foo.txt"#;
let input = r"C:\foo.txt";
let expected = PathOrUrl::Path(PathBuf::from(input));
let actual = parse_path_or_url(input).unwrap();
assert_eq!(expected, actual);
}

#[test]
fn test_parse_path_or_url_path_8() {
let input = r#".\"#;
let input = r".\";
let expected = PathOrUrl::Path(PathBuf::from(input));
let actual = parse_path_or_url(input).unwrap();
assert_eq!(expected, actual);
Expand Down

0 comments on commit f6d54e9

Please sign in to comment.