For once_cell, use either the std or the critical-section feature

fortanix · Jul 18, 2023 · 4e8143e · 4e8143e
1 parent 73ae14b
commit 4e8143e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mbedtls-platform-support/Cargo.toml b/mbedtls-platform-support/Cargo.toml
@@ -22,7 +22,7 @@ links = "mbedtls-platform-support"
 cfg-if = "1.0.0"
 spin = { version = "0.4.0", default-features = false, optional = true }
 chrono = { version = "0.4", optional = true }
-once_cell = { version = "1.17.1", optional = true }
+once_cell = { version = "1.17.1", default-features = false }
 
 [target.x86_64-fortanix-unknown-sgx.dependencies]
 chrono = "0.4"
@@ -39,8 +39,9 @@ cc = "1.0"
 
 [features]
 time = ["mbedtls-sys-auto/time"]
-std = ["mbedtls-sys-auto/std"]
+std = ["mbedtls-sys-auto/std", "once_cell/std"]
+no_std_deps = ["spin", "once_cell/critical-section"]
 force_aesni_support = ["mbedtls-sys-auto/custom_has_support", "mbedtls-sys-auto/aes_alt", "aesni"]
 aesni = ["mbedtls-sys-auto/aesni"]
-tls13 = ["mbedtls-sys-auto/tls13", "once_cell"]
+tls13 = ["mbedtls-sys-auto/tls13"]
 rdrand = []
diff --git a/mbedtls/Cargo.toml b/mbedtls/Cargo.toml
@@ -64,7 +64,7 @@ cc = "1.0"
 default = ["std", "aesni", "time", "padlock"]
 std = ["byteorder/std", "mbedtls-sys-auto/std", "serde/std", "yasna", "mbedtls-platform-support/std"]
 debug = ["mbedtls-sys-auto/debug"]
-no_std_deps = ["mbedtls-platform-support/spin", "serde/alloc"]
+no_std_deps = ["mbedtls-platform-support/no_std_deps", "serde/alloc"]
 force_aesni_support = ["mbedtls-platform-support/force_aesni_support", "aesni"]
 mpi_force_c_code = ["mbedtls-sys-auto/mpi_force_c_code"]
 rdrand = ["mbedtls-platform-support/rdrand"]