Skip to content

Commit 9768cb3

Browse files
authored
Merge pull request #537 from nullr0ute/prepare-0.4.12
Prepare 0.4.12
2 parents c630de4 + 84e3e6d commit 9768cb3

File tree

18 files changed

+113
-72
lines changed

18 files changed

+113
-72
lines changed

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

admin-tool/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-admin-tool"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Antonio Murdaca <[email protected]>"]
55
edition = "2018"
66

@@ -21,10 +21,10 @@ pretty_env_logger = "0.4"
2121
nix = "0.26"
2222
tokio = { version = "1", features = ["full"] }
2323

24-
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
25-
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["server", "client"] }
26-
fdo-store = { path = "../store", version = "0.4.11", features = ["directory"] }
27-
fdo-util = { path = "../util", version = "0.4.11" }
24+
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
25+
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server", "client"] }
26+
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
27+
fdo-util = { path = "../util", version = "0.4.12" }
2828

2929
[dev-dependencies]
3030
rand = "0.8"

client-linuxapp/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-client-linuxapp"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Patrick Uiterwijk <[email protected]>"]
55
edition = "2018"
66

@@ -22,6 +22,6 @@ secrecy = "0.8"
2222
devicemapper = "0.33"
2323
openssl = "0.10.55"
2424

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

data-formats/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-data-formats"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Patrick Uiterwijk <[email protected]>"]
55
edition = "2018"
66

fido-device-onboard.spec

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%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)
44

55
Name: fido-device-onboard
6-
Version: 0.4.11
6+
Version: 0.4.12
77
Release: 1%{?dist}
88
Summary: A rust implementation of the FIDO Device Onboard Specification
99
License: BSD-3-Clause
@@ -64,7 +64,21 @@ install -D -m 0644 -t %{buildroot}%{_docdir}/fdo examples/config/*
6464
# duplicates as needed by AIO command so link them
6565
ln -s %{_bindir}/fdo-owner-tool %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool
6666
ln -s %{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool
67+
# Create directories needed by the various services so we own them
6768
mkdir -p %{buildroot}%{_sysconfdir}/fdo
69+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/keys
70+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores
71+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturer_keys
72+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturing_sessions
73+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_onboarding_sessions
74+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_vouchers
75+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_registered
76+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_sessions
77+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/serviceinfo_api_devices
78+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/manufacturing-server.conf.d
79+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/owner-onboarding-server.conf.d
80+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/rendezvous-server.conf.d
81+
mkdir -p %{buildroot}%{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
6882
# Dracut manufacturing service
6983
install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/module-setup.sh
7084
install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/manufacturing-client-generator
@@ -93,6 +107,14 @@ Requires: openssl-libs >= 3.0.1-12
93107

94108
%files -n fdo-owner-onboarding-server
95109
%license LICENSE LICENSE.dependencies
110+
%dir %{_sysconfdir}/fdo
111+
%dir %{_sysconfdir}/fdo/keys
112+
%dir %{_sysconfdir}/fdo/owner-onboarding-server.conf.d
113+
%dir %{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
114+
%dir %{_sysconfdir}/fdo/stores
115+
%dir %{_sysconfdir}/fdo/stores/owner_onboarding_sessions
116+
%dir %{_sysconfdir}/fdo/stores/owner_vouchers
117+
%dir %{_sysconfdir}/fdo/stores/serviceinfo_api_devices
96118
%{_libexecdir}/fdo/fdo-owner-onboarding-server
97119
%{_libexecdir}/fdo/fdo-serviceinfo-api-server
98120
%dir %{_docdir}/fdo
@@ -122,6 +144,12 @@ License: %combined_license
122144

123145
%files -n fdo-rendezvous-server
124146
%license LICENSE LICENSE.dependencies
147+
%dir %{_sysconfdir}/fdo
148+
%dir %{_sysconfdir}/fdo/keys
149+
%dir %{_sysconfdir}/fdo/rendezvous-server.conf.d
150+
%dir %{_sysconfdir}/fdo/stores
151+
%dir %{_sysconfdir}/fdo/stores/rendezvous_registered
152+
%dir %{_sysconfdir}/fdo/stores/rendezvous_sessions
125153
%{_libexecdir}/fdo/fdo-rendezvous-server
126154
%dir %{_docdir}/fdo
127155
%{_docdir}/fdo/rendezvous-*.yml
@@ -145,6 +173,14 @@ Requires: openssl-libs >= 3.0.1-12
145173

146174
%files -n fdo-manufacturing-server
147175
%license LICENSE LICENSE.dependencies
176+
%dir %{_sysconfdir}/fdo
177+
%dir %{_sysconfdir}/fdo/keys
178+
%dir %{_sysconfdir}/fdo/manufacturing-server.conf.d
179+
%dir %{_sysconfdir}/fdo/keys
180+
%dir %{_sysconfdir}/fdo/stores
181+
%dir %{_sysconfdir}/fdo/stores/manufacturer_keys
182+
%dir %{_sysconfdir}/fdo/stores/manufacturing_sessions
183+
%dir %{_sysconfdir}/fdo/stores/owner_vouchers
148184
%{_libexecdir}/fdo/fdo-manufacturing-server
149185
%dir %{_docdir}/fdo
150186
%{_docdir}/fdo/manufacturing-server.yml
@@ -199,8 +235,6 @@ License: %combined_license
199235
Summary: FDO admin tools implementation
200236
License: %combined_license
201237
Requires: fdo-manufacturing-server = %{version}-%{release}
202-
Requires: fdo-init = %{version}-%{release}
203-
Requires: fdo-client = %{version}-%{release}
204238
Requires: fdo-rendezvous-server = %{version}-%{release}
205239
Requires: fdo-owner-onboarding-server = %{version}-%{release}
206240
Requires: fdo-owner-cli = %{version}-%{release}
@@ -209,10 +243,11 @@ Requires: fdo-owner-cli = %{version}-%{release}
209243

210244
%files -n fdo-admin-cli
211245
%license LICENSE LICENSE.dependencies
246+
%dir %{_sysconfdir}/fdo
247+
%dir %{_sysconfdir}/fdo/keys
212248
%{_bindir}/fdo-admin-tool
213249
%{_libexecdir}/fdo/fdo-admin-tool
214250
%{_unitdir}/fdo-aio.service
215-
%dir %{_sysconfdir}/fdo
216251

217252
%post -n fdo-admin-cli
218253
%systemd_post fdo-aio.service
@@ -224,9 +259,15 @@ Requires: fdo-owner-cli = %{version}-%{release}
224259
%systemd_postun_with_restart fdo-aio.service
225260

226261
%changelog
262+
* Wed Jul 26 2023 Peter Robinson <[email protected]> - 0.4.12-1
263+
- Update to 0.4.12
264+
227265
* Mon Jul 03 2023 Peter Robinson <[email protected]> - 0.4.11-1
228266
- Update to 0.4.11
229267

268+
* Mon Jul 03 2023 Peter Robinson <[email protected]> - 0.4.10-2
269+
- Updates for eln/c9s building
270+
230271
* Fri Jun 23 2023 Peter Robinson <[email protected]> - 0.4.10-1
231272
- Update to 0.4.10
232273

http-wrapper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-http-wrapper"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Patrick Uiterwijk <[email protected]>"]
55
edition = "2018"
66

@@ -18,8 +18,8 @@ hex = "0.4"
1818

1919
openssl = "0.10.55"
2020

21-
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
22-
fdo-store = { path = "../store", version = "0.4.11" }
21+
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
22+
fdo-store = { path = "../store", version = "0.4.12" }
2323
aws-nitro-enclaves-cose = "0.4.0"
2424

2525
# Server-side

integration-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "integration-tests"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
edition = "2018"
55
publish = false
66

libfdo-data/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-data"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
edition = "2018"
55

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

1111
[dependencies]
12-
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
12+
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
1313
libc = "0.2"
1414

1515
[build-dependencies]

libfdo-data/fdo_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#define FDO_DATA_MAJOR 0
1414
#define FDO_DATA_MINOR 4
15-
#define FDO_DATA_PATCH 11
15+
#define FDO_DATA_PATCH 12
1616

1717
typedef struct FdoOwnershipVoucher FdoOwnershipVoucher;
1818

make-vendored-tarfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#/bin/bash
22
set -x
3-
vendor_tarball=$1
3+
ver=$1
44
cargo vendor
55
# Various vendor cleanups
66
pushd vendor
@@ -11,4 +11,4 @@ rm -rf winapi-x86_64-pc-windows-gnu/lib/*
1111
rm -rf winapi-i686-pc-windows-gnu/lib/*
1212
rm -rf vcpkg/test-data
1313
popd #vendor
14-
tar cjf $vendor_tarball vendor/
14+
tar cjf fido-device-onboard-rs-$ver-vendor-patched.tar.xz vendor/

manufacturing-client/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-manufacturing-client"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Patrick Uiterwijk <[email protected]>"]
55
edition = "2018"
66

@@ -17,6 +17,6 @@ rand = "0.8.4"
1717
tss-esapi = { version = "7.2", features = ["generate-bindings"] }
1818
regex = "1.3.7"
1919

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

manufacturing-server/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fdo-manufacturing-server"
3-
version = "0.4.11"
3+
version = "0.4.12"
44
authors = ["Patrick Uiterwijk <[email protected]>"]
55
edition = "2018"
66

@@ -18,7 +18,7 @@ log = "0.4"
1818
hex = "0.4"
1919
serde_yaml = "0.9"
2020

21-
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
22-
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["server"] }
23-
fdo-store = { path = "../store", version = "0.4.11", features = ["directory"] }
24-
fdo-util = { path = "../util", version = "0.4.11" }
21+
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
22+
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server"] }
23+
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
24+
fdo-util = { path = "../util", version = "0.4.12" }

0 commit comments

Comments
 (0)