remove remaining libwally code/header uses

The defines (SHA256_LEN for example) are replaced by new definitions
or inlined.

Author: benma

src/common_main.c

@@ -24,7 +24,6 @@
 #include "screen.h"
 #include "securechip/securechip.h"
 #include "util.h"
-#include <wally_core.h>
 
 extern void __attribute__((noreturn)) __stack_chk_fail(void);
 void __attribute__((noreturn)) __stack_chk_fail(void)
@@ -52,22 +51,6 @@ static const securechip_interface_functions_t _securechip_interface_functions =
     .random_32_bytes = random_32_bytes,
 };
 
-static void _wally_patched_bzero(void* ptr, size_t len)
-{
-    util_zero(ptr, len);
-}
-
-static bool _setup_wally(void)
-{
-    static struct wally_operations _ops = {0};
-    _ops.struct_size = sizeof(struct wally_operations);
-    if (wally_get_operations(&_ops) != WALLY_OK) {
-        return false;
-    }
-    _ops.bzero_fn = _wally_patched_bzero;
-    return wally_set_operations(&_ops) == WALLY_OK;
-}
-
 void common_main(void)
 {
     mpu_bitbox02_init();
@@ -76,10 +59,6 @@ void common_main(void)
         AbortAutoenter("memory_setup failed");
     }
 
-    if (!_setup_wally()) {
-        AbortAutoenter("_setup_wally failed");
-    }
-
     /* Enable/configure SmartEEPROM. */
     smarteeprom_bb02_config();
 

src/factorysetup.c

@@ -35,8 +35,6 @@
 #include <secp256k1.h>
 #include <ui/oled/oled.h>
 
-#include <wally_crypto.h>
-
 #define BUFFER_SIZE_DOWN 1024
 #define BUFFER_SIZE_UP 1024
 
@@ -387,7 +385,7 @@ static void _api_msg(const uint8_t* input, size_t in_len, uint8_t* output, size_
             result = ERR_INVALID_INPUT;
             break;
         }
-        uint8_t msg32[SHA256_LEN] = {0};
+        uint8_t msg32[32] = {0};
         _attestation_sighash(attestation_device_pubkey, msg32);
         bool matches_a_root_pubkey = false;
         for (size_t pubkey_idx = 0; pubkey_idx < sizeof(_root_pubkey_bytes) / ROOT_PUBKEY_SIZE;

src/keystore.c

@@ -464,7 +464,7 @@ bool keystore_unlock_bip39(const char* mnemonic_passphrase)
         return false;
     }
 
-    uint8_t bip39_seed[BIP39_SEED_LEN_512] = {0};
+    uint8_t bip39_seed[64] = {0};
     UTIL_CLEANUP_64(bip39_seed);
     rust_derive_bip39_seed(
         rust_util_bytes(seed, seed_length),

src/keystore.h

@@ -22,9 +22,6 @@
 #include <stdint.h>
 
 #include <secp256k1.h>
-#include <wally_bip32.h>
-#include <wally_bip39.h> // for BIP39_WORDLIST_LEN
-#include <wally_crypto.h> // for EC_PUBLIC_KEY_LEN
 
 #define KEYSTORE_MAX_SEED_LENGTH (32)
 #define KEYSTORE_U2F_SEED_LENGTH SHA256_LEN

src/rust/bitbox02-rust/src/workflow/mnemonic.rs

@@ -29,6 +29,9 @@ use sha2::{Digest, Sha256};
 
 const NUM_RANDOM_WORDS: u8 = 5;
 
+/// Number of words in the BIP-39 wordlist.
+const BIP39_WORDLIST_LEN: u16 = 2048;
+
 fn as_str_vec(v: &[zeroize::Zeroizing<String>]) -> Vec<&str> {
     v.iter().map(|s| s.as_str()).collect()
 }
@@ -56,7 +59,7 @@ fn create_random_unique_words(word: &str, length: u8) -> (u8, Vec<zeroize::Zeroi
             // A random word everywhere else.
             // Loop until we get a unique word, we don't want repeated words in the list.
             loop {
-                let idx = rand16() % bitbox02::keystore::BIP39_WORDLIST_LEN;
+                let idx = rand16() % BIP39_WORDLIST_LEN;
                 if picked_indices.contains(&idx) {
                     continue;
                 };
@@ -319,7 +322,7 @@ pub async fn get(
         .await;
 
     // Provide all bip39 words to restrict the keyboard entry.
-    let bip39_wordlist: Vec<u16> = (0..bitbox02::keystore::BIP39_WORDLIST_LEN).collect();
+    let bip39_wordlist: Vec<u16> = (0..BIP39_WORDLIST_LEN).collect();
 
     let mut word_idx: usize = 0;
     let mut entered_words = vec![zeroize::Zeroizing::new(String::new()); num_words];
@@ -430,7 +433,7 @@ mod tests {
 
     fn bruteforce_lastword(mnemonic: &[&str]) -> Vec<zeroize::Zeroizing<String>> {
         let mut result = Vec::new();
-        for i in 0..bitbox02::keystore::BIP39_WORDLIST_LEN {
+        for i in 0..BIP39_WORDLIST_LEN {
             let word = bitbox02::keystore::get_bip39_word(i).unwrap();
             let mut m = mnemonic.to_vec();
             m.push(&word);

src/rust/bitbox02-sys/build.rs

@@ -157,7 +157,6 @@ const ALLOWLIST_FNS: &[&str] = &[
     "ui_screen_stack_pop_all",
     "ui_screen_stack_push",
     "util_format_datetime",
-    "wally_free_string",
     "communication_mode_ble_enabled",
 ];
 
@@ -213,8 +212,6 @@ pub fn main() -> Result<(), &'static str> {
         "../../usb/class/hid",
         "../../usb/class/hid/hww",
         "../../usb/class/hid/u2f",
-        // $WALLY_INCLUDES
-        "../../../external/libwally-core/include",
         // $SECP256k1_INCLUDES
         "../../../external/libwally-core/src/secp256k1/include",
     ];

src/rust/bitbox02-sys/wrapper.h

@@ -50,9 +50,6 @@
 #include <ui/screen_stack.h>
 #include <ui/ugui/ugui.h>
 #include <util.h>
-#include <wally_bip39.h>
-#include <wally_core.h>
-#include <wally_crypto.h>
 
 #if defined(TESTING)
 #include <fake_memory.h>

src/rust/bitbox02/src/keystore.rs

@@ -24,8 +24,8 @@ use core::convert::TryInto;
 
 use bitbox02_sys::keystore_error_t;
 
-pub const BIP39_WORDLIST_LEN: u16 = bitbox02_sys::BIP39_WORDLIST_LEN as u16;
-pub const EC_PUBLIC_KEY_LEN: usize = bitbox02_sys::EC_PUBLIC_KEY_LEN as _;
+/// Length of a compressed secp256k1 pubkey.
+const EC_PUBLIC_KEY_LEN: usize = 33;
 pub const MAX_SEED_LENGTH: usize = bitbox02_sys::KEYSTORE_MAX_SEED_LENGTH as usize;
 
 pub fn is_locked() -> bool {

src/u2f.c

@@ -34,7 +34,6 @@
 #include <usb/usb_processing.h>
 #include <utils_assert.h>
 #include <version.h>
-#include <wally_crypto.h>
 
 #ifndef TESTING
 #include <hal_timer.h>
@@ -49,6 +48,8 @@ typedef struct {
 
 #define APDU_LEN(A) (uint32_t)(((A).lc1 << 16) + ((A).lc2 << 8) + ((A).lc3))
 #define U2F_KEYHANDLE_LEN (U2F_NONCE_LENGTH + SHA256_LEN)
+#define SHA256_LEN 32
+#define HMAC_SHA256_LEN 32
 
 #if (U2F_EC_KEY_SIZE != SHA256_LEN) || (U2F_EC_KEY_SIZE != U2F_NONCE_LENGTH)
 #error "Incorrect macro values for u2f"

src/u2f/u2f_app.c

@@ -7,7 +7,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <wally_bip39.h>
 
 #define APPID_BOGUS_CHROMIUM "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 #define APPID_BOGUS_FIREFOX "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"