From a4e61d430a4c2875061678fbc622bf3524e073af Mon Sep 17 00:00:00 2001 From: Thomas Epperson Date: Sat, 20 Apr 2024 16:02:50 -0500 Subject: [PATCH 1/8] Add bundled feature and improve support for windows. Signed-off-by: Thomas Epperson --- tss-esapi-sys/Cargo.toml | 8 +- tss-esapi-sys/build.rs | 211 +++++++++++++++++++++++++++++++++++++- tss-esapi/Cargo.toml | 1 + tss-esapi/build.rs | 4 + tss-esapi/src/tcti_ldr.rs | 5 + 5 files changed, 226 insertions(+), 3 deletions(-) diff --git a/tss-esapi-sys/Cargo.toml b/tss-esapi-sys/Cargo.toml index 0e8615fc..7bbf2e11 100644 --- a/tss-esapi-sys/Cargo.toml +++ b/tss-esapi-sys/Cargo.toml @@ -14,11 +14,17 @@ links = "tss2-esys" rust-version = "1.66.0" [build-dependencies] -bindgen = { version = "0.66.1", optional = true } +autotools = { version = "0.2.6", optional = true } +bindgen = { version = "0.69.4", optional = true } pkg-config = "0.3.18" target-lexicon = "0.12.0" cfg-if = "1.0.0" semver = "1.0.7" +[target.'cfg(windows)'.build-dependencies] +msbuild = { git = "https://github.com/uglyoldbob/msbuild.git", optional = true } +winreg = {version = "0.52", optional = true } + [features] generate-bindings = ["bindgen"] +bundled = ["dep:autotools", "dep:msbuild", "dep:winreg"] diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index d261d567..f3c14520 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -9,11 +9,21 @@ fn main() { cfg_if::cfg_if! { if #[cfg(feature = "generate-bindings")] { + #[cfg(feature = "bundled")] + let installation = tpm2_tss::Installation::bundled(); + #[cfg(not(feature = "bundled"))] let installation = tpm2_tss::Installation::probe(true); let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); installation.generate_bindings(&out_dir.join("tss_esapi_bindings.rs")); + installation.output_linker_arguments(); } else { target::ensure_supported(); + #[cfg(feature = "bundled")] + { + let installation = tpm2_tss::Installation::bundled(); + installation.pkg_config(); + } + #[cfg(not(feature = "bundled"))] let _ = tpm2_tss::Installation::probe(false); } } @@ -59,7 +69,7 @@ pub mod tpm2_tss { /// The installed tpm2-tss libraries that are of /// interest. pub struct Installation { - _tss2_sys: Library, + tss2_sys: Library, tss2_esys: Library, tss2_tctildr: Library, tss2_mu: Library, @@ -67,11 +77,150 @@ pub mod tpm2_tss { } impl Installation { + fn platform_args() -> Option> { + cfg_if::cfg_if! { + if #[cfg(windows)] { + let mut clang_args: Vec = Vec::new(); + let hklm = winreg::RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE); + let sdk_entry = hklm.open_subkey("SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0").unwrap(); + let installation_path: String = sdk_entry.get_value("InstallationFolder").unwrap(); + let ip_pb = PathBuf::from(installation_path).join("Include"); + let windows_sdk = ip_pb.join("10.0.17134.0"); + clang_args.push(format!("-I{}", windows_sdk.join("ucrt").display())); + clang_args.push(format!("-I{}", windows_sdk.join("um").display())); + clang_args.push(format!("-I{}", windows_sdk.join("shared").display())); + Some(clang_args) + } + else { + None + } + } + } + + #[cfg(feature = "bundled")] + /// Fetch the given source repo using git + fn fetch_source( + dest_path: impl AsRef, + name: &str, + repo: &str, + branch: &str, + ) -> std::path::PathBuf { + let parent_path = dest_path.as_ref(); + let repo_path = parent_path.join(name); + if !repo_path.join("Makefile.am").exists() { + let output = std::process::Command::new("git") + .args(["clone", repo, "--depth", "1", "--branch", branch]) + .current_dir(parent_path) + .output() + .unwrap_or_else(|_| panic!("git clone for {} failed", name)); + let status = output.status; + if !status.success() { + panic!( + "git clone for {} returned failure status {}:\n{:?}", + name, status, output + ); + } + } + + repo_path + } + + #[cfg(feature = "bundled")] + fn compile_with_autotools(p: PathBuf) -> PathBuf { + let output1 = std::process::Command::new("./bootstrap") + .current_dir(&p) + .output() + .expect("bootstrap script failed"); + let status = output1.status; + if !status.success() { + panic!("bootstrap script failed with {}:\n{:?}", status, output1); + } + + let mut config = autotools::Config::new(p); + config.fast_build(true).reconf("-ivf").build() + } + + #[cfg(feature = "bundled")] + /// Uses a bundled build for an installation + pub fn bundled() -> Self { + use std::io::Write; + let out_path = std::env::var("OUT_DIR").expect("No output directory given"); + let source_path = Self::fetch_source( + out_path, + "tpm2-tss", + "https://github.com/tpm2-software/tpm2-tss.git", + MINIMUM_VERSION, + ); + let version_file_name = source_path.join("VERSION"); + let mut version_file = std::fs::File::create(version_file_name) + .expect("Unable to create version file for tpm2-tss"); + write!(version_file, "{}", MINIMUM_VERSION) + .unwrap_or_else(|e| panic!("Failed to write version file: {}", e)); + + cfg_if::cfg_if! { + if #[cfg(windows)] { + let mut msbuild = msbuild::MsBuild::find_msbuild(Some("2017")).unwrap(); + let profile = std::env::var("PROFILE").unwrap(); + let build_string = match profile.as_str() { + "debug" => "", + "release" => "/p:Configuration=Release", + _ => panic!("Unknown cargo profile:"), + }; + + msbuild.run(source_path.clone(), &[ + build_string, + "tpm2-tss.sln"]); + } + else { + let install_path = Self::compile_with_autotools(source_path.clone()); + std::env::set_var( + "PKG_CONFIG_PATH", + format!("{}", install_path.join("lib").join("pkgconfig").display()), + ); + } + } + std::env::set_var(PATH_ENV_VAR_NAME, source_path.clone()); + + let include_path = source_path.join("include").join("tss2"); + + #[cfg(windows)] + let tbs = Some(Library { + header_file: Some(include_path.join("tss2_tcti_tbs.h")), + version: MINIMUM_VERSION.into(), + name: "tss2-tbs".into(), + }); + #[cfg(not(windows))] + let tbs = None; + Self { + tss2_sys: Library { + header_file: Some(include_path.join("tss2_sys.h")), + version: MINIMUM_VERSION.into(), + name: "tss2-sys".into(), + }, + tss2_esys: Library { + header_file: Some(include_path.join("tss2_esys.h")), + version: MINIMUM_VERSION.into(), + name: "tss2-esys".into(), + }, + tss2_tctildr: Library { + header_file: Some(include_path.join("tss2_tctildr.h")), + version: MINIMUM_VERSION.into(), + name: "tss2-tctildr".into(), + }, + tss2_mu: Library { + header_file: Some(include_path.join("tss2_mu.h")), + version: MINIMUM_VERSION.into(), + name: "tss2-mu".into(), + }, + tss2_tcti_tbs: tbs, + } + } + /// Probes the system for an installation. pub fn probe(with_header_files: bool) -> Self { let install_path = Installation::installation_path_from_env_var(); Installation { - _tss2_sys: Library::probe_required( + tss2_sys: Library::probe_required( "tss2-sys", install_path.as_ref(), with_header_files, @@ -149,10 +298,58 @@ pub mod tpm2_tss { .clang_arg(tss2_tcti_tbs.include_dir_arg()) .header(tss2_tcti_tbs.header_file_arg()); } + if let Some(clang_args) = Self::platform_args() { + for arg in clang_args { + builder = builder.clang_arg(arg); + } + } builder } } } + + /// Run pkgconfig for bundled installations + #[cfg(feature = "bundled")] + pub fn pkg_config(&self) { + self.tss2_sys.pkg_config(); + self.tss2_esys.pkg_config(); + self.tss2_tctildr.pkg_config(); + self.tss2_mu.pkg_config(); + if let Some(lib) = &self.tss2_tcti_tbs { + lib.pkg_config(); + } + } + + pub fn output_linker_arguments(&self) { + #[cfg(windows)] + { + println!("cargo:rustc-link-lib=dylib=tss2-esys"); + println!("cargo:rustc-link-lib=dylib=tss2-mu"); + println!("cargo:rustc-link-lib=dylib=tss2-sys"); + println!("cargo:rustc-link-lib=dylib=tss2-tctildr"); + println!("cargo:rustc-link-lib=dylib=tss2-tcti-tbs"); + let profile = std::env::var("PROFILE").unwrap(); + let build_string = match profile.as_str() { + "debug" => "Debug", + "release" => "Release", + _ => panic!("Unknown cargo profile:"), + }; + let mut source_path = self + .tss2_esys + .header_file + .clone() + .expect("Expected a header file path"); + source_path.pop(); + source_path.pop(); + source_path.pop(); + println!("Source path is {}", source_path.display()); + println!( + "cargo:rustc-link-search=dylib={}", + source_path.join("x64").join(build_string).display() + ); + } + } + /// Retrieves the installation path from the environment variable and validates it. fn installation_path_from_env_var() -> Option<(PathBuf, String)> { std::env::var(PATH_ENV_VAR_NAME).map_or_else( @@ -372,6 +569,16 @@ pub mod tpm2_tss { ) } + /// Use the pkg config file for a bundled installation + #[cfg(feature = "bundled")] + fn pkg_config(&self) { + pkg_config::Config::new() + .atleast_version(MINIMUM_VERSION) + .statik(true) + .probe(&self.name) + .unwrap_or_else(|_| panic!("Failed to run pkg-config on {}", self.name)); + } + /// Probe the system for an optional library using pkg-config. /// /// # Args diff --git a/tss-esapi/Cargo.toml b/tss-esapi/Cargo.toml index 3740da0f..8d5006ec 100644 --- a/tss-esapi/Cargo.toml +++ b/tss-esapi/Cargo.toml @@ -49,3 +49,4 @@ default = ["abstraction"] generate-bindings = ["tss-esapi-sys/generate-bindings"] abstraction = ["oid", "picky-asn1", "picky-asn1-x509"] integration-tests = ["strum", "strum_macros"] +bundled = [ "tss-esapi-sys/bundled" ] \ No newline at end of file diff --git a/tss-esapi/build.rs b/tss-esapi/build.rs index 4f5ff480..2ae2742c 100644 --- a/tss-esapi/build.rs +++ b/tss-esapi/build.rs @@ -3,6 +3,10 @@ use semver::{Version, VersionReq}; fn main() { + #[cfg(feature = "bundled")] + { + std::env::set_var("DEP_TSS2_ESYS_VERSION", "3.2.2"); + } let tss_version_string = std::env::var("DEP_TSS2_ESYS_VERSION") .expect("Failed to parse ENV variable DEP_TSS2_ESYS_VERSION as string"); diff --git a/tss-esapi/src/tcti_ldr.rs b/tss-esapi/src/tcti_ldr.rs index f564baf8..814f80c3 100644 --- a/tss-esapi/src/tcti_ldr.rs +++ b/tss-esapi/src/tcti_ldr.rs @@ -21,6 +21,7 @@ const DEVICE: &str = "device"; const MSSIM: &str = "mssim"; const SWTPM: &str = "swtpm"; const TABRMD: &str = "tabrmd"; +const TBS: &str = "tbs"; /// TCTI Context created via a TCTI Loader Library. /// Wrapper around the TSS2_TCTI_CONTEXT structure. @@ -143,6 +144,8 @@ pub enum TctiNameConf { /// /// For more information about configuration, see [this page](https://www.mankier.com/3/Tss2_Tcti_Tabrmd_Init) Tabrmd(TabrmdConfig), + /// Connect to a TPM using windows services + Tbs, } impl TctiNameConf { @@ -174,6 +177,7 @@ impl TryFrom for CString { TctiNameConf::Mssim(..) => MSSIM, TctiNameConf::Swtpm(..) => SWTPM, TctiNameConf::Tabrmd(..) => TABRMD, + TctiNameConf::Tbs => TBS, }; let tcti_conf = match tcti { @@ -204,6 +208,7 @@ impl TryFrom for CString { TctiNameConf::Tabrmd(config) => { format!("bus_name={},bus_type={}", config.bus_name, config.bus_type) } + TctiNameConf::Tbs => String::new(), }; if tcti_conf.is_empty() { From 5b94d1e5b6be72d831da6eb4e0932e9815f02543 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 08:53:39 +0200 Subject: [PATCH 2/8] WIP: Add CI for building the project on Windows Signed-off-by: Wiktor Kwapisiewicz --- .github/workflows/win-build.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/win-build.yml diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml new file mode 100644 index 00000000..044725d5 --- /dev/null +++ b/.github/workflows/win-build.yml @@ -0,0 +1,17 @@ +name: CI + +on: + pull_request: + push: + branches: [ main ] + workflow_dispatch: + +jobs: + check-win-build: + name: Check build on Windows + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + - run: cargo build --features generate-bindings,bundled From ec9ad8296c60fb020103eb20fe863eebe100d2f4 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 09:06:27 +0200 Subject: [PATCH 3/8] Lookup any version of msbuild --- tss-esapi-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index f3c14520..32d1f2a6 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -159,7 +159,7 @@ pub mod tpm2_tss { cfg_if::cfg_if! { if #[cfg(windows)] { - let mut msbuild = msbuild::MsBuild::find_msbuild(Some("2017")).unwrap(); + let mut msbuild = msbuild::MsBuild::find_msbuild(None).unwrap(); let profile = std::env::var("PROFILE").unwrap(); let build_string = match profile.as_str() { "debug" => "", From e29154789e63ca9383a41c63e4f059db9105e18b Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 09:12:13 +0200 Subject: [PATCH 4/8] Add Setup Windows 10 action --- .github/workflows/win-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 044725d5..d1d03a47 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -14,4 +14,6 @@ jobs: - uses: actions/checkout@v4 - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 + - name: Setup Windows 10 SDK + uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 - run: cargo build --features generate-bindings,bundled From 6272301e545c54df3015e231621fed632a7133ff Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 09:17:18 +0200 Subject: [PATCH 5/8] Use explicit SDK version --- .github/workflows/win-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index d1d03a47..30f9f4c2 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -16,4 +16,6 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Setup Windows 10 SDK uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 + with: + sdk-version: 17134 - run: cargo build --features generate-bindings,bundled From 4691abc54fa2bc294e5740e933ec55d558ff3d4b Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 09:35:07 +0200 Subject: [PATCH 6/8] Use close SDK version --- .github/workflows/win-build.yml | 2 +- tss-esapi-sys/build.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 30f9f4c2..1661c5c2 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -17,5 +17,5 @@ jobs: - name: Setup Windows 10 SDK uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 with: - sdk-version: 17134 + sdk-version: 17763 - run: cargo build --features generate-bindings,bundled diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index 32d1f2a6..9ab09a07 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -85,7 +85,7 @@ pub mod tpm2_tss { let sdk_entry = hklm.open_subkey("SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0").unwrap(); let installation_path: String = sdk_entry.get_value("InstallationFolder").unwrap(); let ip_pb = PathBuf::from(installation_path).join("Include"); - let windows_sdk = ip_pb.join("10.0.17134.0"); + let windows_sdk = ip_pb.join("10.0.17763.0"); clang_args.push(format!("-I{}", windows_sdk.join("ucrt").display())); clang_args.push(format!("-I{}", windows_sdk.join("um").display())); clang_args.push(format!("-I{}", windows_sdk.join("shared").display())); From 4f0017127b9fd165f8949351cda6da54dbb4d116 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 09:41:09 +0200 Subject: [PATCH 7/8] Use less picky version --- tss-esapi-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index 9ab09a07..15037973 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -148,7 +148,7 @@ pub mod tpm2_tss { let source_path = Self::fetch_source( out_path, "tpm2-tss", - "https://github.com/tpm2-software/tpm2-tss.git", + "https://github.com/wiktor-k/tpm2-tss.git", MINIMUM_VERSION, ); let version_file_name = source_path.join("VERSION"); From ec047a328e721bc3e4a2e8e4dcb48cd12b417765 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 29 May 2024 11:07:54 +0200 Subject: [PATCH 8/8] Set correct VS toolset --- .github/workflows/win-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 1661c5c2..e414d690 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -18,4 +18,7 @@ jobs: uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 with: sdk-version: 17763 + - uses: seanmiddleditch/gha-setup-vsdevenv@master + with: + toolset_version: v141_clang_c2 - run: cargo build --features generate-bindings,bundled