diff --git a/Cargo.lock b/Cargo.lock index 091cb68e5..abbafcabe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdo-admin-tool" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "clap 4.4.18", @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "fdo-client-linuxapp" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "devicemapper", @@ -1020,7 +1020,7 @@ dependencies = [ [[package]] name = "fdo-data" -version = "0.5.0" +version = "0.5.1" dependencies = [ "assert-str", "cbindgen", @@ -1032,7 +1032,7 @@ dependencies = [ [[package]] name = "fdo-data-formats" -version = "0.5.0" +version = "0.5.1" dependencies = [ "aws-nitro-enclaves-cose", "byteorder", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "fdo-db" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "diesel", @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "fdo-http-wrapper" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-trait", "aws-nitro-enclaves-cose", @@ -1093,7 +1093,7 @@ dependencies = [ [[package]] name = "fdo-manufacturing-client" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "clap 4.4.18", @@ -1112,7 +1112,7 @@ dependencies = [ [[package]] name = "fdo-manufacturing-server" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "config", @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "fdo-owner-onboarding-server" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "config", @@ -1158,7 +1158,7 @@ dependencies = [ [[package]] name = "fdo-owner-tool" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "clap 4.4.18", @@ -1179,7 +1179,7 @@ dependencies = [ [[package]] name = "fdo-rendezvous-server" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "config", @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "fdo-serviceinfo-api-server" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "config", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "fdo-store" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -1234,7 +1234,7 @@ dependencies = [ [[package]] name = "fdo-util" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "config", @@ -1866,7 +1866,7 @@ dependencies = [ [[package]] name = "integration-tests" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "fdo-data-formats", diff --git a/admin-tool/Cargo.toml b/admin-tool/Cargo.toml index f3f0ebec2..d4a3d140a 100644 --- a/admin-tool/Cargo.toml +++ b/admin-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-admin-tool" -version = "0.5.0" +version = "0.5.1" authors = ["Antonio Murdaca "] edition = "2018" @@ -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.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } -fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server", "client"] } +fdo-store = { path = "../store", version = "0.5.1", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.1" } clap_builder = "4.4" [dev-dependencies] diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml index db0357caa..1a2c0b479 100644 --- a/client-linuxapp/Cargo.toml +++ b/client-linuxapp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-client-linuxapp" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -21,6 +21,6 @@ secrecy = "0.8" devicemapper = "0.34" openssl = "0.10.66" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["client"] } +fdo-util = { path = "../util", version = "0.5.1" } diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml index 105814d93..83979e142 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-data-formats" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" diff --git a/db/Cargo.toml b/db/Cargo.toml index 43cd8be83..93a4f8fbf 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-db" -version = "0.5.0" +version = "0.5.1" edition = "2021" @@ -8,10 +8,10 @@ edition = "2021" anyhow = "1.0" diesel = { version = "2.2.3", features = ["sqlite", "postgres", "r2d2"] } -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } [dev-dependencies] -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server"] } openssl = "0.10.66" [features] diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 20953ed89..0f2ee2c7a 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -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.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: A rust implementation of the FIDO Device Onboard Specification License: BSD-3-Clause @@ -25,12 +25,12 @@ BuildRequires: rust-packaging BuildRequires: clang-devel BuildRequires: cryptsetup-devel BuildRequires: device-mapper-devel -BuildRequires: libpq-devel BuildRequires: golang BuildRequires: openssl-devel >= 3.0.1-12 -BuildRequires: sqlite-devel BuildRequires: systemd-rpm-macros BuildRequires: tpm2-tss-devel +BuildRequires: sqlite-devel +BuildRequires: libpq-devel %description %{summary}. @@ -313,6 +313,9 @@ Requires: fdo-init = %{version}-%{release} %systemd_postun_with_restart fdo-aio.service %changelog +* Thu Nov 21 2024 Antonio Murdaca - 0.5.1-1 +- Update to 0.5.1 + * Tue Feb 20 2024 Peter Robinson - 0.5.0-1 - Update to 0.5.0 diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml index ca5f07a1b..0decb0ca5 100644 --- a/http-wrapper/Cargo.toml +++ b/http-wrapper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-http-wrapper" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -18,8 +18,8 @@ hex = "0.4" openssl = "0.10.66" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-store = { path = "../store", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-store = { path = "../store", version = "0.5.1" } aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" } # Server-side diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 1cb8d33c7..17b9f8f57 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration-tests" -version = "0.5.0" +version = "0.5.1" edition = "2018" publish = false diff --git a/libfdo-data/Cargo.toml b/libfdo-data/Cargo.toml index 4e8c5f37b..e01cc474d 100644 --- a/libfdo-data/Cargo.toml +++ b/libfdo-data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-data" -version = "0.5.0" +version = "0.5.1" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,7 +9,7 @@ edition = "2018" crate-type = ["cdylib"] [dependencies] -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } libc = "0.2" [build-dependencies] diff --git a/libfdo-data/fdo_data.h b/libfdo-data/fdo_data.h index 299e24299..b385b0bd6 100644 --- a/libfdo-data/fdo_data.h +++ b/libfdo-data/fdo_data.h @@ -12,7 +12,7 @@ #define FDO_DATA_MAJOR 0 #define FDO_DATA_MINOR 5 -#define FDO_DATA_PATCH 0 +#define FDO_DATA_PATCH 1 typedef struct FdoOwnershipVoucher FdoOwnershipVoucher; diff --git a/manufacturing-client/Cargo.toml b/manufacturing-client/Cargo.toml index c535a81d1..d331f458e 100644 --- a/manufacturing-client/Cargo.toml +++ b/manufacturing-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-client" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,7 +17,7 @@ rand = "0.8.4" tss-esapi = { version = "7.4", features = ["generate-bindings"] } regex = "1.3.7" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["client"] } +fdo-util = { path = "../util", version = "0.5.1" } clap_builder = "4.4" diff --git a/manufacturing-server/Cargo.toml b/manufacturing-server/Cargo.toml index 014a862d7..298559272 100644 --- a/manufacturing-server/Cargo.toml +++ b/manufacturing-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-server" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -21,7 +21,7 @@ tar = "0.4.41" flate2 = "1.0.31" tempdir = "0.3.7" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } -fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server"] } +fdo-store = { path = "../store", version = "0.5.1", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.1" } diff --git a/owner-onboarding-server/Cargo.toml b/owner-onboarding-server/Cargo.toml index 3767b1060..34c0c9134 100644 --- a/owner-onboarding-server/Cargo.toml +++ b/owner-onboarding-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-owner-onboarding-server" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -21,7 +21,7 @@ serde_yaml = "0.9" time = "0.3" hex = "0.4" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } -fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server", "client"] } +fdo-store = { path = "../store", version = "0.5.1", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.1" } diff --git a/owner-tool/Cargo.toml b/owner-tool/Cargo.toml index a91d1c4a9..53c84b60a 100644 --- a/owner-tool/Cargo.toml +++ b/owner-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-owner-tool" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,10 +17,10 @@ tokio = { version = "1", features = ["full"] } tss-esapi = { version = "7.4", features = ["generate-bindings"] } reqwest = { version = "0.12.7", features = ["blocking"] } -fdo-util = { path = "../util", version = "0.5.0" } -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } -fdo-db = { path = "../db", version = "0.5.0"} +fdo-util = { path = "../util", version = "0.5.1" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["client"] } +fdo-db = { path = "../db", version = "0.5.1"} hex = "0.4" clap_builder = "4.4" diff --git a/patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch b/patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch index 722d680b6..5b2ea36ca 100644 --- a/patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch +++ b/patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch @@ -1,16 +1,16 @@ -From d9554495b54d1f150a85f4e329412ff62728d9c7 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 15 Feb 2024 12:06:44 +0000 +From f1b53d4bdac4ab889eb084111f395d418945ed07 Mon Sep 17 00:00:00 2001 +From: Antonio Murdaca +Date: Mon, 25 Nov 2024 12:30:52 +0100 Subject: [PATCH] Revert "chore: use git fork for aws-nitro-enclaves-cose" This reverts commit 1ea09e88baee3c47cdc76902f0034d553207d515. --- data-formats/Cargo.toml | 2 +- http-wrapper/Cargo.toml | 2 +- - 3 files changed, 4 insertions(+), 3 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) -Sdiff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml -index 714fc55..6d00eb4 100644 +diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml +index 83979e1..c8ae80f 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -17,7 +17,7 @@ serde_cbor = "0.11" @@ -23,18 +23,18 @@ index 714fc55..6d00eb4 100644 num-traits = "0.2" num-derive = "0.3" diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml -index 5d4999c..7b98097 100644 +index 0decb0c..70fcf41 100644 --- a/http-wrapper/Cargo.toml +++ b/http-wrapper/Cargo.toml -@@ -20,7 +20,7 @@ openssl = "0.10.60" +@@ -20,7 +20,7 @@ openssl = "0.10.66" - fdo-data-formats = { path = "../data-formats", version = "0.5.0" } - fdo-store = { path = "../store", version = "0.5.0" } + fdo-data-formats = { path = "../data-formats", version = "0.5.1" } + fdo-store = { path = "../store", version = "0.5.1" } -aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" } +aws-nitro-enclaves-cose = "0.4.0" # Server-side uuid = { version = "1.3", features = ["v4"], optional = true } -- -2.43.1 +2.47.0 diff --git a/rendezvous-server/Cargo.toml b/rendezvous-server/Cargo.toml index e4f477e4a..86b4a6711 100644 --- a/rendezvous-server/Cargo.toml +++ b/rendezvous-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-rendezvous-server" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,7 +17,7 @@ warp = "0.3.6" log = "0.4" time = "0.3" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } -fdo-store = { path = "../store", version = "0.5.0" } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server"] } +fdo-store = { path = "../store", version = "0.5.1" } +fdo-util = { path = "../util", version = "0.5.1" } diff --git a/serviceinfo-api-server/Cargo.toml b/serviceinfo-api-server/Cargo.toml index 91472e941..aec11c963 100644 --- a/serviceinfo-api-server/Cargo.toml +++ b/serviceinfo-api-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-serviceinfo-api-server" -version = "0.5.0" +version = "0.5.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +16,7 @@ serde = "1" serde_bytes = "0.11" serde_json = "1" -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } -fdo-util = { path = "../util", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server"] } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-store = { path = "../store", version = "0.5.1", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.1" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 5cda7ba5d..091ff3343 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-store" -version = "0.5.0" +version = "0.5.1" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -9,7 +9,7 @@ edition = "2018" [dependencies] anyhow = { version = "1", optional = true} -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } thiserror = "1" async-trait = "0.1" @@ -23,7 +23,7 @@ xattr = { version = "1.0", default-features = false, optional = true } # We *ne serde_cbor = { version = "0.11", optional = true } # database -fdo-db = { path = "../db", version = "0.5.0"} +fdo-db = { path = "../db", version = "0.5.1"} diesel = { version = "2.2.3", features = ["sqlite", "postgres", "r2d2"], optional = true } diff --git a/util/Cargo.toml b/util/Cargo.toml index 0356f06ff..6a41ccaa7 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-util" -version = "0.5.0" +version = "0.5.1" authors = ["Antonio Murdaca "] edition = "2018" @@ -13,9 +13,9 @@ glob = "0.3.1" log = "0.4" serde = "1" -fdo-data-formats = { path = "../data-formats", version = "0.5.0" } -fdo-store = { path = "../store", version = "0.5.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } +fdo-data-formats = { path = "../data-formats", version = "0.5.1" } +fdo-store = { path = "../store", version = "0.5.1" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.1", features = ["server", "client"] } serde_yaml = "0.9" serde_cbor = "0.11" serde_json = "1"