diff --git a/README.md b/README.md index 8ab1188c..35ebeb20 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ features that interact with a VBS enclave easier. To learn more about VBS enclav | Language | Supported | |-------------------|-----------| | C++ (20 or later) | ✅ | -| Rust | ❌ | +| Rust | ✅ | #### Operating System Support diff --git a/rust/edlcodegen/crates/libs/edlcodegen-core/Cargo.toml b/rust/edlcodegen/crates/libs/edlcodegen-core/Cargo.toml index 609b4ed8..bfa1806d 100644 --- a/rust/edlcodegen/crates/libs/edlcodegen-core/Cargo.toml +++ b/rust/edlcodegen/crates/libs/edlcodegen-core/Cargo.toml @@ -2,6 +2,11 @@ name = "edlcodegen-core" version = "0.1.0" edition = { workspace = true } +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-codegen", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os", "no-std"] +description = "Internal core types and utilities shared by edlcodegen host and enclave support crates" [lib] crate-type = ["rlib"] diff --git a/rust/edlcodegen/crates/libs/edlcodegen-enclave/Cargo.toml b/rust/edlcodegen/crates/libs/edlcodegen-enclave/Cargo.toml index 3bc7a4e9..4b6663c7 100644 --- a/rust/edlcodegen/crates/libs/edlcodegen-enclave/Cargo.toml +++ b/rust/edlcodegen/crates/libs/edlcodegen-enclave/Cargo.toml @@ -2,6 +2,11 @@ name = "edlcodegen-enclave" version = "0.1.0" edition = { workspace = true } +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-codegen", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os", "no-std"] +description = "Enclave-side ABI and runtime support for Rust crates generated by edlcodegen" [dependencies] edlcodegen-core = { workspace = true } diff --git a/rust/edlcodegen/crates/libs/edlcodegen-host/Cargo.toml b/rust/edlcodegen/crates/libs/edlcodegen-host/Cargo.toml index 8154286e..bccc2881 100644 --- a/rust/edlcodegen/crates/libs/edlcodegen-host/Cargo.toml +++ b/rust/edlcodegen/crates/libs/edlcodegen-host/Cargo.toml @@ -2,6 +2,11 @@ name = "edlcodegen-host" version = "0.1.0" edition.workspace = true +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-codegen", "enclave"] +categories = ["os"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +description = "Host-side ABI and runtime support for Rust crates generated by edlcodegen" [dependencies] edlcodegen-core = { workspace = true } diff --git a/rust/edlcodegen/crates/libs/edlcodegen-macros/Cargo.toml b/rust/edlcodegen/crates/libs/edlcodegen-macros/Cargo.toml index f0472e3e..928c0fd2 100644 --- a/rust/edlcodegen/crates/libs/edlcodegen-macros/Cargo.toml +++ b/rust/edlcodegen/crates/libs/edlcodegen-macros/Cargo.toml @@ -2,6 +2,11 @@ name = "edlcodegen-macros" version = "0.1.0" edition.workspace = true +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-codegen", "enclave"] +categories = ["os"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +description = "Internal procedural macros used by edlcodegen-generated crates" [lib] proc-macro = true diff --git a/rust/edlcodegen/crates/libs/edlcodegen-tools/Cargo.toml b/rust/edlcodegen/crates/libs/edlcodegen-tools/Cargo.toml index 7e0770e0..c57a5a30 100644 --- a/rust/edlcodegen/crates/libs/edlcodegen-tools/Cargo.toml +++ b/rust/edlcodegen/crates/libs/edlcodegen-tools/Cargo.toml @@ -2,6 +2,11 @@ name = "edlcodegen-tools" version = "0.1.0" edition = { workspace = true } +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-codegen", "enclave"] +categories = ["os"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +description = "Command-line tooling for generating Rust crates from EDL files, including the edlcodegen executable" [dependencies] winreg = "0.55.0" \ No newline at end of file diff --git a/rust/edlcodegen/crates/tests/edlcodegen/Cargo.toml b/rust/edlcodegen/crates/tests/edlcodegen/Cargo.toml index 7bb5e7e4..effeeaa2 100644 --- a/rust/edlcodegen/crates/tests/edlcodegen/Cargo.toml +++ b/rust/edlcodegen/crates/tests/edlcodegen/Cargo.toml @@ -3,6 +3,9 @@ name = "edlcodegen" version = "0.0.0" edition.workspace = true publish = false +license = "MIT" +repository = "https://github.com/microsoft/VbsEnclaveTooling" +description = "Internal test crate for edlcodegen tooling" [lib] doc = false diff --git a/rust/sdk/Cargo.toml b/rust/sdk/Cargo.toml index eebf5a33..cd3986f8 100644 --- a/rust/sdk/Cargo.toml +++ b/rust/sdk/Cargo.toml @@ -3,8 +3,8 @@ resolver = "3" members = [ "crates/libs/sdk-enclave", "crates/libs/sdk-host", - "crates/libs/sdk-enclave/generated/sdk_gen", - "crates/libs/sdk-host/generated/sdk_gen", + "crates/libs/sdk-enclave/generated/vbsenclave_sdk_gen", + "crates/libs/sdk-host/generated/vbsenclave_sdk_gen", "crates/libs/userboundkey-kcm", "crates/tests/sdk", "crates/libs/windows-enclave", @@ -12,16 +12,22 @@ members = [ [workspace.package] edition = "2024" +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-sdk", "enclave", "windows"] +categories = ["virtualization", "os"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" [workspace.dependencies] -edlcodegen-tools = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +edlcodegen-tools = { version = "0.1" } regex = "1.11" spin = "0.10.0" tracelogging = { version ="1.2.4", default-features = false } userboundkey-kcm = { version = "0.1.0", path = "crates/libs/userboundkey-kcm" } uuid = {version = "1.19.0", default-features = false } vbsenclave-sdk-enclave = { version = "0.1.0", path = "crates/libs/sdk-enclave" } +vbsenclave_sdk_enclave_gen = { version = "0.1.0", path = "crates/libs/sdk-enclave/generated/vbsenclave_sdk_gen" } vbsenclave-sdk-host = { version = "0.1.0", path = "crates/libs/sdk-host" } +vbsenclave_sdk_host_gen = { version = "0.1.0", path = "crates/libs/sdk-host/generated/vbsenclave_sdk_gen" } widestring = { version = "1.1", default-features = false, features = ["alloc"] } windows = "0.62.2" windows-bindgen = "0.66.0" diff --git a/rust/sdk/crates/libs/sdk-enclave/Cargo.toml b/rust/sdk/crates/libs/sdk-enclave/Cargo.toml index d54eb525..b9a8ebdb 100644 --- a/rust/sdk/crates/libs/sdk-enclave/Cargo.toml +++ b/rust/sdk/crates/libs/sdk-enclave/Cargo.toml @@ -2,9 +2,14 @@ name = "vbsenclave-sdk-enclave" version = "0.1.0" edition = { workspace = true } +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-sdk", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os", "no-std"] +description = "Enclave-side Rust SDK for developing applications using Windows VBS enclaves" [dependencies] -sdk_enclave_gen = { path = "./generated/sdk_gen" } +vbsenclave_sdk_enclave_gen = { workspace = true } spin = { workspace = true } tracelogging = { workspace = true, features = ["etw", "kernel_mode"] } uuid = { workspace = true, default-features = false, features = [ "v4"] } diff --git a/rust/sdk/crates/libs/sdk-enclave/src/common/sdk_impls.rs b/rust/sdk/crates/libs/sdk-enclave/src/common/sdk_impls.rs index 0e345885..3bd8d59d 100644 --- a/rust/sdk/crates/libs/sdk-enclave/src/common/sdk_impls.rs +++ b/rust/sdk/crates/libs/sdk-enclave/src/common/sdk_impls.rs @@ -10,10 +10,10 @@ use crate::etw; use crate::userboundkey; -use sdk_enclave_gen::AbiError; -use sdk_enclave_gen::implementation::trusted::Trusted; -use sdk_enclave_gen::implementation::types::attestationReportAndSessionInfo; -use sdk_enclave_gen::implementation::types::{EventFilterDescriptor, Guid}; +use vbsenclave_sdk_enclave_gen::AbiError; +use vbsenclave_sdk_enclave_gen::implementation::trusted::Trusted; +use vbsenclave_sdk_enclave_gen::implementation::types::attestationReportAndSessionInfo; +use vbsenclave_sdk_enclave_gen::implementation::types::{EventFilterDescriptor, Guid}; /// SDK enclave implementation of the Trusted trait. /// diff --git a/rust/sdk/crates/libs/sdk-enclave/src/etw.rs b/rust/sdk/crates/libs/sdk-enclave/src/etw.rs index 19e32719..0eaa575a 100644 --- a/rust/sdk/crates/libs/sdk-enclave/src/etw.rs +++ b/rust/sdk/crates/libs/sdk-enclave/src/etw.rs @@ -4,11 +4,11 @@ use crate::common; use alloc::{collections::BTreeMap, vec::Vec}; use core::marker::PhantomData; -use sdk_enclave_gen::AbiError; -use sdk_enclave_gen::implementation::types as edl_types; -use sdk_enclave_gen::stubs::untrusted::{self}; use spin::{Once, RwLock}; use tracelogging::{Channel, Level, Opcode, Provider}; +use vbsenclave_sdk_enclave_gen::AbiError; +use vbsenclave_sdk_enclave_gen::implementation::types as edl_types; +use vbsenclave_sdk_enclave_gen::stubs::untrusted::{self}; /// Information about a registered ETW provider. /// The registration_id is generated during registration diff --git a/rust/sdk/crates/libs/sdk-enclave/src/lib.rs b/rust/sdk/crates/libs/sdk-enclave/src/lib.rs index e8049e4d..1136ebd8 100644 --- a/rust/sdk/crates/libs/sdk-enclave/src/lib.rs +++ b/rust/sdk/crates/libs/sdk-enclave/src/lib.rs @@ -12,8 +12,8 @@ pub mod userboundkey; // Re-export generated SDK enclave's export macro // and println stub for use in this crate's macros. -pub use sdk_enclave_gen::export_enclave_functions; -pub use sdk_enclave_gen::stubs::untrusted::println; +pub use vbsenclave_sdk_enclave_gen::export_enclave_functions; +pub use vbsenclave_sdk_enclave_gen::stubs::untrusted::println; /// Export all SDK enclave functions. /// diff --git a/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/mod.rs b/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/mod.rs index 8fbe7a13..877a076a 100644 --- a/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/mod.rs +++ b/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/mod.rs @@ -16,16 +16,16 @@ pub use crypto::{ pub use types::*; // Re-export the cache config type for use by samples -pub use sdk_enclave_gen::implementation::types::keyCredentialCacheConfig; +pub use vbsenclave_sdk_enclave_gen::implementation::types::keyCredentialCacheConfig; // Re-export widestring types for public API consumers pub use widestring::U16Str; use alloc::vec::Vec; -use sdk_enclave_gen::AbiError; -use sdk_enclave_gen::implementation::types::attestationReportAndSessionInfo; -use sdk_enclave_gen::stubs::untrusted; +use vbsenclave_sdk_enclave_gen::AbiError; +use vbsenclave_sdk_enclave_gen::implementation::types::attestationReportAndSessionInfo; +use vbsenclave_sdk_enclave_gen::stubs::untrusted; use widestring::U16String; use windows_enclave::veinterop::{ diff --git a/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/types.rs b/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/types.rs index 7ae8b9d1..48d74c6c 100644 --- a/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/types.rs +++ b/rust/sdk/crates/libs/sdk-enclave/src/userboundkey/types.rs @@ -5,7 +5,7 @@ use crate::common::{CryptoError, EnclaveUtilsError, ntstatus_to_hresult}; use alloc::string::String; -use sdk_enclave_gen::AbiError; +use vbsenclave_sdk_enclave_gen::AbiError; /// Error type for user-bound key operations #[derive(Debug)] diff --git a/rust/sdk/crates/libs/sdk-host/Cargo.toml b/rust/sdk/crates/libs/sdk-host/Cargo.toml index e4861cfe..8343a385 100644 --- a/rust/sdk/crates/libs/sdk-host/Cargo.toml +++ b/rust/sdk/crates/libs/sdk-host/Cargo.toml @@ -2,6 +2,11 @@ name = "vbsenclave-sdk-host" version = "0.1.0" edition.workspace = true +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-sdk", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os"] +description = "Host-side Rust SDK for interacting with Windows VBS enclaves" [dependencies.windows] workspace = true @@ -18,7 +23,7 @@ features = [ ] [dependencies] -sdk_host_gen = { path = "./generated/sdk_gen" } +vbsenclave_sdk_host_gen = { workspace = true } spin = { workspace = true } userboundkey-kcm = { workspace = true } uuid = {version = "1.19.0", default-features = false } diff --git a/rust/sdk/crates/libs/sdk-host/src/common/sdk_impls.rs b/rust/sdk/crates/libs/sdk-host/src/common/sdk_impls.rs index 70595b12..de8846ba 100644 --- a/rust/sdk/crates/libs/sdk-host/src/common/sdk_impls.rs +++ b/rust/sdk/crates/libs/sdk-host/src/common/sdk_impls.rs @@ -10,11 +10,11 @@ use crate::etw; use crate::userboundkey; -use sdk_host_gen::AbiError; -use sdk_host_gen::implementation::types::{ +use vbsenclave_sdk_host_gen::AbiError; +use vbsenclave_sdk_host_gen::implementation::types::{ EventDataDescriptor, EventDescriptor, Guid, credentialAndSessionInfo, keyCredentialCacheConfig, }; -use sdk_host_gen::implementation::untrusted::Untrusted; +use vbsenclave_sdk_host_gen::implementation::untrusted::Untrusted; use widestring::{U16Str, U16String}; /// SDK host implementation of the Untrusted trait. diff --git a/rust/sdk/crates/libs/sdk-host/src/enclave.rs b/rust/sdk/crates/libs/sdk-host/src/enclave.rs index 4a6b8413..fa42ff02 100644 --- a/rust/sdk/crates/libs/sdk-host/src/enclave.rs +++ b/rust/sdk/crates/libs/sdk-host/src/enclave.rs @@ -423,7 +423,7 @@ impl EnclaveHandle { impl Drop for EnclaveHandle { fn drop(&mut self) { if !self.enclave.is_null() { - let host = sdk_host_gen::SdkHost::new(self.enclave); + let host = vbsenclave_sdk_host_gen::SdkHost::new(self.enclave); let _ = host.unregister_etw_providers(); // SAFETY: self.enclave is valid because it came from create() diff --git a/rust/sdk/crates/libs/sdk-host/src/etw.rs b/rust/sdk/crates/libs/sdk-host/src/etw.rs index 4e21161d..b61cfd9e 100644 --- a/rust/sdk/crates/libs/sdk-host/src/etw.rs +++ b/rust/sdk/crates/libs/sdk-host/src/etw.rs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -use sdk_host_gen::AbiError; -use sdk_host_gen::SdkHost; -use sdk_host_gen::implementation::types as codegen_types; use std::sync::{OnceLock, RwLock}; +use vbsenclave_sdk_host_gen::AbiError; +use vbsenclave_sdk_host_gen::SdkHost; +use vbsenclave_sdk_host_gen::implementation::types as codegen_types; use windows::Win32::System::Diagnostics::Etw; #[repr(C)] diff --git a/rust/sdk/crates/libs/sdk-host/src/lib.rs b/rust/sdk/crates/libs/sdk-host/src/lib.rs index 3351401a..40d29317 100644 --- a/rust/sdk/crates/libs/sdk-host/src/lib.rs +++ b/rust/sdk/crates/libs/sdk-host/src/lib.rs @@ -8,7 +8,7 @@ mod etw; pub mod userboundkey; use common::HostImpl; -use sdk_host_gen::AbiError; +use vbsenclave_sdk_host_gen::AbiError; // The userboundkey-kcm crate is not intended to be published as a standalone package. // Long term, these KCM APIs should be consumed from the windows-rs crate. @@ -42,7 +42,7 @@ pub use userboundkey_kcm::KeyCredentialManager; /// ``` pub fn register_sdk_callbacks(enclave_ptr: *mut core::ffi::c_void) -> Result<(), AbiError> { // Register SDK callbacks using the SdkHost interface and HostImpl - let sdk_wrapper = sdk_host_gen::SdkHost::new(enclave_ptr); + let sdk_wrapper = vbsenclave_sdk_host_gen::SdkHost::new(enclave_ptr); sdk_wrapper.register_vtl0_callbacks::()?; sdk_wrapper.register_etw_providers()?; diff --git a/rust/sdk/crates/libs/sdk-host/src/userboundkey/mod.rs b/rust/sdk/crates/libs/sdk-host/src/userboundkey/mod.rs index 63b25ab1..01a63fcf 100644 --- a/rust/sdk/crates/libs/sdk-host/src/userboundkey/mod.rs +++ b/rust/sdk/crates/libs/sdk-host/src/userboundkey/mod.rs @@ -17,9 +17,9 @@ macro_rules! debug_print { }; } -use sdk_host_gen::AbiError; -pub use sdk_host_gen::SdkHost; -pub use sdk_host_gen::implementation::types::{ +use vbsenclave_sdk_host_gen::AbiError; +pub use vbsenclave_sdk_host_gen::SdkHost; +pub use vbsenclave_sdk_host_gen::implementation::types::{ attestationReportAndSessionInfo, credentialAndSessionInfo, keyCredentialCacheConfig, }; diff --git a/rust/sdk/crates/libs/userboundkey-kcm/Cargo.toml b/rust/sdk/crates/libs/userboundkey-kcm/Cargo.toml index e0e570be..65fc6d1d 100644 --- a/rust/sdk/crates/libs/userboundkey-kcm/Cargo.toml +++ b/rust/sdk/crates/libs/userboundkey-kcm/Cargo.toml @@ -2,6 +2,11 @@ name = "userboundkey-kcm" version = "0.1.0" edition.workspace = true +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-sdk", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os"] +description = "Internal bindings and helpers for Windows KCM User-Bound Key APIs" [build-dependencies] windows-bindgen = { workspace = true } diff --git a/rust/sdk/crates/libs/windows-enclave/Cargo.toml b/rust/sdk/crates/libs/windows-enclave/Cargo.toml index 973ac071..0367819a 100644 --- a/rust/sdk/crates/libs/windows-enclave/Cargo.toml +++ b/rust/sdk/crates/libs/windows-enclave/Cargo.toml @@ -2,6 +2,11 @@ name = "windows-enclave" version = "0.1.0" edition.workspace = true +license = "MIT" +keywords = ["vbs", "vbs-enclave", "vbs-enclave-sdk", "enclave"] +repository = "https://github.com/microsoft/VbsEnclaveTooling" +categories = ["os"] +description = "Low-level FFI bindings for Windows APIs exposed to VBS enclaves" [build-dependencies] windows-bindgen = { workspace = true } diff --git a/rust/sdk/crates/samples/userboundkey/enclave/Cargo.toml b/rust/sdk/crates/samples/userboundkey/enclave/Cargo.toml index c061155f..1cc35c9c 100644 --- a/rust/sdk/crates/samples/userboundkey/enclave/Cargo.toml +++ b/rust/sdk/crates/samples/userboundkey/enclave/Cargo.toml @@ -2,6 +2,7 @@ name = "userboundkey-sample-enclave" version = "0.1.0" edition = { workspace = true } +publish = false [lib] # Make sure crate builds a dll and not a static lib diff --git a/rust/sdk/crates/samples/userboundkey/host/Cargo.toml b/rust/sdk/crates/samples/userboundkey/host/Cargo.toml index 5560dde3..c37f48df 100644 --- a/rust/sdk/crates/samples/userboundkey/host/Cargo.toml +++ b/rust/sdk/crates/samples/userboundkey/host/Cargo.toml @@ -2,6 +2,7 @@ name = "userboundkey-sample-host" version = "0.1.0" edition = { workspace = true } +publish = false [[bin]] name = "userboundkey-sample" diff --git a/rust/sdk/generate_codegen_for_workspace.ps1 b/rust/sdk/generate_codegen_for_workspace.ps1 index 88f2ebcd..f6079c71 100644 --- a/rust/sdk/generate_codegen_for_workspace.ps1 +++ b/rust/sdk/generate_codegen_for_workspace.ps1 @@ -27,7 +27,7 @@ $sdkEdl = Join-Path $sdkImportDir "sdk.edl" -HostAppOutDir "$hostSdkCrate\generated" ` -EnclaveOutDir "$enclaveSdkCrate\generated" ` -EdlPath $sdkEdl ` - -Namespace "sdk" ` + -Namespace "vbsenclave_sdk" ` -ImportDirectories $sdkImportDir ` -Vtl0ClassName "SdkHost" diff --git a/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/Enclave/code_gen_test_gen/Cargo.toml b/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/Enclave/code_gen_test_gen/Cargo.toml index fd474b09..c63f3071 100644 --- a/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/Enclave/code_gen_test_gen/Cargo.toml +++ b/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/Enclave/code_gen_test_gen/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "code_gen_test_enclave_gen" -version = "0.0.0" +version = "0.1.0" edition = "2024" -publish = false +description = "Generated internal helper crate containing EDL-derived host bindings and marshaling code" +license = "MIT" [lib] -doc = false doctest = false test = false [build-dependencies] -edlcodegen-tools = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +edlcodegen-tools = { version = "0.1" } [dependencies] -edlcodegen-enclave = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +edlcodegen-enclave = { version = "0.1" } flatbuffers = { version = "25.9.23", default-features = false } widestring = { version = "1.2.1", default-features = false, features = ["alloc"] } diff --git a/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/HostApp/code_gen_test_gen/Cargo.toml b/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/HostApp/code_gen_test_gen/Cargo.toml index d9097577..115be189 100644 --- a/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/HostApp/code_gen_test_gen/Cargo.toml +++ b/src/ToolingSharedLibrary/CurrentCodeGenerationState/Rust/HostApp/code_gen_test_gen/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "code_gen_test_host_gen" -version = "0.0.0" +version = "0.1.0" edition = "2024" -publish = false +description = "Generated internal helper crate containing EDL-derived host bindings and marshaling code" +license = "MIT" [lib] -doc = false doctest = false test = false [build-dependencies] -edlcodegen-tools = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +edlcodegen-tools = { version = "0.1" } [dependencies] -edlcodegen-host = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +edlcodegen-host = { version = "0.1" } windows-strings = "0.5" flatbuffers = { version = "25.9.23", default-features = false } widestring = { version = "1.2.1", default-features = false, features = ["alloc"] } diff --git a/src/ToolingSharedLibrary/Includes/CodeGeneration/Rust/Constants.h b/src/ToolingSharedLibrary/Includes/CodeGeneration/Rust/Constants.h index 4172a2ba..dc238cd3 100644 --- a/src/ToolingSharedLibrary/Includes/CodeGeneration/Rust/Constants.h +++ b/src/ToolingSharedLibrary/Includes/CodeGeneration/Rust/Constants.h @@ -9,32 +9,32 @@ namespace CodeGeneration::Rust { inline constexpr std::string_view c_array_initializer = "[{};{}]"; - // Temporary crate dependency string for edlcodegen-enclave until we publish to crates.io. - // When testing not yet merged changes to edlcodegen-enclave, add the following: rev = "" + // When testing not yet merged changes to edlcodegen-enclave, use the following: + // edlcodegen-enclave = { git = "https://github.com/microsoft/VbsEnclaveTooling", rev = "" } // after the subdir specification below. - inline constexpr std::string_view c_enclave_crate_dep = R"(edlcodegen-enclave = { git = "https://github.com/microsoft/VbsEnclaveTooling" })"; + inline constexpr std::string_view c_enclave_crate_dep = R"(edlcodegen-enclave = { version = "0.1" })"; - // Temporary crate dependency string for edlcodegen-host until we publish to crates.io. - // When testing not yet merged changes to edlcodegen-host, add the following: rev = "" + // When testing not yet merged changes to edlcodegen-host, use the following: + // edlcodegen-host = { git = "https://github.com/microsoft/VbsEnclaveTooling", rev = "" } // after the subdir specification below. inline constexpr std::string_view c_host_crate_dep = -R"(edlcodegen-host = { git = "https://github.com/microsoft/VbsEnclaveTooling" } +R"(edlcodegen-host = { version = "0.1" } windows-strings = "0.5")"; inline constexpr std::string_view c_cargo_toml_content = R"([package] name = "{}" -version = "0.0.0" +version = "0.1.0" edition = "2024" -publish = false +description = "Generated internal helper crate containing EDL-derived host bindings and marshaling code" +license = "MIT" [lib] -doc = false doctest = false test = false [build-dependencies] -edlcodegen-tools = {{ git = "https://github.com/microsoft/VbsEnclaveTooling" }} +edlcodegen-tools = {{ version = "0.1" }} [dependencies] {}