From b7f91fe5a5bad433481f9a48540e61e78fc1dfbe Mon Sep 17 00:00:00 2001
From: ClaraCrazy <clara@cynthialabs.net>
Date: Sun, 4 Jun 2023 10:48:51 +0200
Subject: [PATCH] Add furi_hal_version_uid_default (Fix TOTP)

---
 applications/external/totp/services/crypto/crypto.c  | 2 +-
 firmware/targets/f7/api_symbols.csv                  | 1 +
 firmware/targets/f7/furi_hal/furi_hal_version.c      | 4 ++++
 firmware/targets/furi_hal_include/furi_hal_version.h | 2 ++
 lib/STM32CubeWB                                      | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 160000 lib/STM32CubeWB

diff --git a/applications/external/totp/services/crypto/crypto.c b/applications/external/totp/services/crypto/crypto.c
index 03d9c9d51..d01fe5c11 100644
--- a/applications/external/totp/services/crypto/crypto.c
+++ b/applications/external/totp/services/crypto/crypto.c
@@ -90,7 +90,7 @@ CryptoSeedIVResult
             max_i = uid_size;
         }
 
-        const uint8_t* uid = furi_hal_version_uid();
+        const uint8_t* uid = furi_hal_version_uid_default();
         for(uint8_t i = 0; i < max_i; i++) {
             plugin_state->iv[i] = plugin_state->iv[i] ^ uid[i];
         }
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 863cbcb6f..a8a32069b 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1531,6 +1531,7 @@ Function,+,furi_hal_version_get_otp_version,FuriHalVersionOtpVersion,
 Function,-,furi_hal_version_init,void,
 Function,-,furi_hal_version_set_name,void,const char*
 Function,+,furi_hal_version_uid,const uint8_t*,
+Function,+,furi_hal_version_uid_default,const uint8_t*,
 Function,+,furi_hal_version_uid_size,size_t,
 Function,-,furi_hal_vibro_init,void,
 Function,+,furi_hal_vibro_on,void,_Bool
diff --git a/firmware/targets/f7/furi_hal/furi_hal_version.c b/firmware/targets/f7/furi_hal/furi_hal_version.c
index 814ec3926..66580945e 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_version.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_version.c
@@ -318,6 +318,10 @@ size_t furi_hal_version_uid_size() {
     return 64 / 8;
 }
 
+const uint8_t* furi_hal_version_uid_default() {
+    return (const uint8_t*)UID64_BASE;
+}
+
 const uint8_t* furi_hal_version_uid() {
     if(version_get_custom_name(NULL) != NULL) {
         return (const uint8_t*)&(*((uint32_t*)version_get_custom_name(NULL)));
diff --git a/firmware/targets/furi_hal_include/furi_hal_version.h b/firmware/targets/furi_hal_include/furi_hal_version.h
index df97a988a..351a4da10 100644
--- a/firmware/targets/furi_hal_include/furi_hal_version.h
+++ b/firmware/targets/furi_hal_include/furi_hal_version.h
@@ -204,6 +204,8 @@ size_t furi_hal_version_uid_size();
  */
 const uint8_t* furi_hal_version_uid();
 
+const uint8_t* furi_hal_version_uid_default();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/STM32CubeWB b/lib/STM32CubeWB
new file mode 160000
index 000000000..a9e29b431
--- /dev/null
+++ b/lib/STM32CubeWB
@@ -0,0 +1 @@
+Subproject commit a9e29b431f6dac95b6fc860a717834f35b7f78e5