Merge branch 'conditional'

Author: benma

src/rust/bitbox02-rust-c/Cargo.toml

@@ -73,7 +73,16 @@ platform-bitbox02 = []
 platform-bitbox02plus = ["util/sha2", "bitbox02-noise", "bitbox02-rust"]
 
 bootloader = []
-firmware = ["bitbox02-rust", "bitbox02-rust/firmware", "bitbox02", "bitbox02-noise", "util/sha2", "util/p256", "util/firmware", "der", "bitbox-aes"]
+firmware = [
+  "bitbox02-rust",
+  "bitbox02-rust/firmware",
+  "bitbox02",
+  "bitbox02-noise",
+  "util/sha2",
+  "util/firmware",
+  "der",
+  "bitbox-aes",
+]
 
 # Only to be enabled in Rust unit tests.
 testing = ["bitbox02-rust/testing", "bitbox02/testing"]
@@ -100,6 +109,7 @@ app-litecoin = [
 app-u2f = [
   # enable this feature in the deps
   "bitbox02-rust/app-u2f",
+  "util/p256",
 ]
 
 app-cardano = [

src/rust/bitbox02-rust/src/keystore.rs

@@ -187,7 +187,7 @@ pub fn secp256k1_schnorr_sign(
 /// # Safety
 ///
 /// keypath pointer has point to a buffer of length `keypath_len` uint32 elements.
-#[cfg(feature = "firmware")]
+#[cfg(feature = "c-unit-testing")]
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn rust_secp256k1_get_private_key(
     keypath: *const u32,