Skip to content

Commit

Permalink
chore: bump for 0.4.11 release
Browse files Browse the repository at this point in the history 
Prepare for the 0.4.11 release.
Explicitly force the generation of the tss-esapi bindings.
This is for vendored building on non x86_64/aarch64 due to
issues with tss-essapi-sys which needs this feature enabled.

Signed-off-by: Peter Robinson <[email protected]>
  • Loading branch information
@nullr0ute
nullr0ute committed Jul 3, 2023
1 parent eac3884 commit 86107fd
Show file tree
Hide file tree
Showing 17 changed files with 86 additions and 71 deletions.
42 changes: 28 additions & 14 deletions Cargo.lock
View file

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

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

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

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

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

Expand All @@ -24,6 +24,6 @@ openssl = "0.10.55"
sha-crypt = "0.5.0"
logtest = "2.0.0"

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

Expand All @@ -23,7 +23,7 @@ num-traits = "0.2"
num-derive = "0.3"
paste = "1.0"
pem = "2.0"
tss-esapi = "7.2"
tss-esapi = { version = "7.2", features = ["generate-bindings"] }
byteorder = "1"

http = "0.2"
Expand Down
7 changes: 4 additions & 3 deletions fido-device-onboard.spec
View file
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.10
Version: 0.4.11
Release: 1%{?dist}
Summary: A rust implementation of the FIDO Device Onboard Specification
License: BSD-3-Clause
Expand All @@ -12,8 +12,6 @@ URL: https://github.com/fedora-iot/fido-device-onboard-rs
Source0: %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
# See make-vendored-tarfile.sh in upstream repo
Source1: %{name}-rs-%{version}-vendor-patched.tar.xz
# From upstream
Patch0: 0001-chore-update-libcryptsetup-rs-to-0.8.patch

# Because nobody cares
ExcludeArch: %{ix86}
Expand Down Expand Up @@ -226,6 +224,9 @@ Requires: fdo-owner-cli = %{version}-%{release}
%systemd_postun_with_restart fdo-aio.service

%changelog
* Mon Jul 03 2023 Peter Robinson <[email protected]> - 0.4.11-1
- Update to 0.4.11

* Fri Jun 23 2023 Peter Robinson <[email protected]> - 0.4.10-1
- Update to 0.4.10

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

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

openssl = "0.10.55"

fdo-data-formats = { path = "../data-formats", version = "0.4.10" }
fdo-store = { path = "../store", version = "0.4.10" }
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-store = { path = "../store", version = "0.4.11" }
aws-nitro-enclaves-cose = "0.4.0"

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

Expand Down
4 changes: 2 additions & 2 deletions libfdo-data/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-data"
version = "0.4.10"
version = "0.4.11"
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.10" }
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
libc = "0.2"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion libfdo-data/fdo_data.h
View file
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 10
#define FDO_DATA_PATCH 11

typedef struct FdoOwnershipVoucher FdoOwnershipVoucher;

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

Expand All @@ -16,9 +16,9 @@ tokio = { version = "1", features = ["full"] }
sys-info = "0.9"
passwd = "0.0.1"
rand = "0.8.4"
tss-esapi = "7.2"
tss-esapi = { version = "7.2", features = ["generate-bindings"] }
regex = "1.3.7"

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

Expand All @@ -14,11 +14,11 @@ openssl = "0.10.55"
serde = { version = "1", features = ["derive"] }
serde_yaml = "0.9"
tokio = { version = "1", features = ["full"] }
tss-esapi = "7.2"
tss-esapi = { version = "7", features = ["generate-bindings"] }

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


hex = "0.4"
Loading

0 comments on commit 86107fd

Please sign in to comment.