Skip to content

Commit 74c7256

Browse files
committed
keystore: remove unused second argument in keystore_mock_unlocked
It's always NULL.
1 parent 3f7d73d commit 74c7256

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

src/keystore.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -539,20 +539,15 @@ bool keystore_secp256k1_sign(
539539
}
540540

541541
#ifdef TESTING
542-
void keystore_mock_unlocked(const uint8_t* seed, size_t seed_len, const uint8_t* bip39_seed)
542+
void keystore_mock_unlocked(const uint8_t* seed, size_t seed_len)
543543
{
544544
_is_unlocked_device = seed != NULL;
545545
if (seed != NULL) {
546546
if (_retain_seed(seed, seed_len) != KEYSTORE_OK) {
547547
Abort("couldn't retain seed");
548548
}
549549
}
550-
_is_unlocked_bip39 = bip39_seed != NULL;
551-
if (bip39_seed != NULL) {
552-
if (!_retain_bip39_seed(bip39_seed)) {
553-
Abort("couldn't retain bip39 seed");
554-
}
555-
}
550+
_is_unlocked_bip39 = false;
556551
}
557552

558553
const uint8_t* keystore_test_get_retained_seed_encrypted(size_t* len_out)

src/keystore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ USE_RESULT bool keystore_secp256k1_sign(
188188
/**
189189
* convenience to mock the keystore state (locked, seed) in tests.
190190
*/
191-
void keystore_mock_unlocked(const uint8_t* seed, size_t seed_len, const uint8_t* bip39_seed);
191+
void keystore_mock_unlocked(const uint8_t* seed, size_t seed_len);
192192

193193
const uint8_t* keystore_test_get_retained_seed_encrypted(size_t* len_out);
194194
const uint8_t* keystore_test_get_retained_bip39_seed_encrypted(size_t* len_out);

src/rust/bitbox02/src/keystore.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,5 @@ pub fn _encrypt_and_store_seed(seed: &[u8], password: &str) -> Result<(), Error>
219219

220220
#[cfg(feature = "testing")]
221221
pub fn mock_unlocked(seed: &[u8]) {
222-
unsafe {
223-
bitbox02_sys::keystore_mock_unlocked(seed.as_ptr(), seed.len() as _, core::ptr::null())
224-
}
222+
unsafe { bitbox02_sys::keystore_mock_unlocked(seed.as_ptr(), seed.len() as _) }
225223
}

0 commit comments

Comments
 (0)