From 4e8143e68537e25af7df758fcb57dad785fe62de Mon Sep 17 00:00:00 2001
From: Tobias Naumann <tobias.naumann@iml.fraunhofer.de>
Date: Tue, 18 Jul 2023 20:38:08 +0200
Subject: [PATCH] For once_cell, use either the std or the critical-section
 feature

---
 Cargo.lock                          | 19 +++++++++++++++++++
 mbedtls-platform-support/Cargo.toml |  7 ++++---
 mbedtls/Cargo.toml                  |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f6dc9090d..54f7cfe28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,6 +52,15 @@ dependencies = [
  "syn 2.0.16",
 ]
 
+[[package]]
+name = "atomic-polyfill"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -200,6 +209,12 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
+[[package]]
+name = "critical-section"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
+
 [[package]]
 name = "cxx"
 version = "1.0.80"
@@ -741,6 +756,10 @@ name = "once_cell"
 version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+dependencies = [
+ "atomic-polyfill",
+ "critical-section",
+]
 
 [[package]]
 name = "peeking_take_while"
diff --git a/mbedtls-platform-support/Cargo.toml b/mbedtls-platform-support/Cargo.toml
index 129e93c93..74eb7128b 100644
--- 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
index 9fe306117..635826f59 100644
--- 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"]