Skip to content

Commit

Permalink
Merge pull request #610 from nullr0ute/release-4.13
Browse files Browse the repository at this point in the history
chore: bump for 0.4.13 release
  • Loading branch information
mergify[bot] authored Jan 25, 2024
2 parents c3e842a + 02359ef commit 3d2dd62
Show file tree
Hide file tree
Showing 18 changed files with 73 additions and 69 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ default-members = [
"manufacturing-client",
"serviceinfo-api-server",
"admin-tool",
]
]

resolver = "2"
12 changes: 6 additions & 6 deletions admin-tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-admin-tool"
version = "0.4.12"
version = "0.4.13"
authors = ["Antonio Murdaca <[email protected]>"]
edition = "2018"

Expand All @@ -21,10 +21,10 @@ pretty_env_logger = "0.5"
nix = "0.26"
tokio = { version = "1", features = ["full"] }

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.13" }

[dev-dependencies]
rand = "0.8"
rand = "0.8"
8 changes: 4 additions & 4 deletions client-linuxapp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-client-linuxapp"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -21,6 +21,6 @@ secrecy = "0.8"
devicemapper = "0.34"
openssl = "0.10.60"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.13" }
2 changes: 1 addition & 1 deletion data-formats/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-data-formats"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand Down
5 changes: 4 additions & 1 deletion fido-device-onboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%global combined_license Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache 2.0) AND ISC AND MIT AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (Apache-2.0 OR MIT OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT)

Name: fido-device-onboard
Version: 0.4.12
Version: 0.4.13
Release: 1%{?dist}
Summary: A rust implementation of the FIDO Device Onboard Specification
License: BSD-3-Clause
Expand Down Expand Up @@ -265,6 +265,9 @@ Requires: fdo-init = %{version}-%{release}
%systemd_postun_with_restart fdo-aio.service

%changelog
* Thu Jan 25 2024 Peter Robinson <[email protected]> - 0.4.13-1
- Update to 0.4.13

* Wed Jul 26 2023 Peter Robinson <[email protected]> - 0.4.12-1
- Update to 0.4.12

Expand Down
6 changes: 3 additions & 3 deletions http-wrapper/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-http-wrapper"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -18,8 +18,8 @@ hex = "0.4"

openssl = "0.10.60"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-store = { path = "../store", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-store = { path = "../store", version = "0.4.13" }
aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" }

# Server-side
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "integration-tests"
version = "0.4.12"
version = "0.4.13"
edition = "2018"
publish = false

Expand Down
4 changes: 2 additions & 2 deletions libfdo-data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-data"
version = "0.4.12"
version = "0.4.13"
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -9,7 +9,7 @@ edition = "2018"
crate-type = ["cdylib"]

[dependencies]
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
libc = "0.2"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion libfdo-data/fdo_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#define FDO_DATA_MAJOR 0
#define FDO_DATA_MINOR 4
#define FDO_DATA_PATCH 12
#define FDO_DATA_PATCH 13

typedef struct FdoOwnershipVoucher FdoOwnershipVoucher;

Expand Down
8 changes: 4 additions & 4 deletions manufacturing-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-manufacturing-client"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -17,6 +17,6 @@ rand = "0.8.4"
tss-esapi = { version = "7.4", features = ["generate-bindings"] }
regex = "1.3.7"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.13" }
10 changes: 5 additions & 5 deletions manufacturing-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-manufacturing-server"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -18,7 +18,7 @@ log = "0.4"
hex = "0.4"
serde_yaml = "0.9"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.13" }
10 changes: 5 additions & 5 deletions owner-onboarding-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-owner-onboarding-server"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -21,7 +21,7 @@ serde_yaml = "0.9"
time = "0.3"
hex = "0.4"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.13" }
9 changes: 4 additions & 5 deletions owner-tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-owner-tool"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -16,9 +16,8 @@ serde_yaml = "0.9"
tokio = { version = "1", features = ["full"] }
tss-esapi = { version = "7.4", features = ["generate-bindings"] }

fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["client"] }

fdo-util = { path = "../util", version = "0.4.13" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] }

hex = "0.4"
10 changes: 5 additions & 5 deletions rendezvous-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-rendezvous-server"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -17,7 +17,7 @@ warp = "0.3.6"
log = "0.4"
time = "0.3"

fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.12" }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.13" }
fdo-util = { path = "../util", version = "0.4.13" }
10 changes: 5 additions & 5 deletions serviceinfo-api-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-serviceinfo-api-server"
version = "0.4.12"
version = "0.4.13"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -16,7 +16,7 @@ serde = "1"
serde_bytes = "0.11"
serde_json = "1"

fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server"] }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }
fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.13" }
4 changes: 2 additions & 2 deletions store/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "fdo-store"
version = "0.4.12"
version = "0.4.13"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-data-formats = { path = "../data-formats", version = "0.4.13" }

thiserror = "1"
async-trait = "0.1"
Expand Down
Loading

0 comments on commit 3d2dd62

Please sign in to comment.