keystore: port _test_keystore_lock to Rust

Author: benma

src/rust/bitbox02/src/keystore.rs

@@ -568,6 +568,22 @@ mod tests {
         assert!(bip39_mnemonic_from_seed(b"foo").is_err());
     }
 
+    #[test]
+    fn test_lock() {
+        lock();
+        assert!(is_locked());
+
+        let seed = hex::decode("cb33c20cea62a5c277527e2002da82e6e2b37450a755143a540a54cea8da9044")
+            .unwrap();
+        assert!(encrypt_and_store_seed(&seed, "password").is_ok());
+        assert!(unlock("password").is_ok());
+        assert!(is_locked()); // still locked, it is only unlocked after unlock_bip39.
+        assert!(unlock_bip39("foo").is_ok());
+        assert!(!is_locked());
+        lock();
+        assert!(is_locked());
+    }
+
     #[test]
     fn test_unlock() {
         mock_memory();
@@ -642,7 +658,6 @@ mod tests {
 
         assert!(encrypt_and_store_seed(&seed, "password").is_ok());
         assert!(unlock("password").is_ok());
-        assert!(is_locked()); // still locked, it is only unlocked after unlock_bip39.
         assert!(unlock_bip39("foo").is_ok());
 
         // Check that the retained bip39 seed was encrypted with the expected encryption key.

test/unit-test/test_keystore.c

@@ -40,18 +40,6 @@ static uint8_t _salt_root[KEYSTORE_MAX_SEED_LENGTH] = {
     0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
 };
 
-static uint8_t _mock_seed[32] = {
-    0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-    0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-};
-
-static uint8_t _mock_bip39_seed[64] = {
-    0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-    0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-    0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-    0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
-};
-
 // Same as Python:
 // import hmac, hashlib; hmac.digest(b"unit-test", b"password", hashlib.sha256).hex()
 // See also: securechip_mock.c
@@ -109,18 +97,6 @@ static void _expect_encrypt_and_store_seed(void)
     will_return(__wrap_memory_is_initialized, false);
 }
 
-static void _test_keystore_lock(void** state)
-{
-    _mock_unlocked(NULL, 0, NULL);
-    assert_true(keystore_is_locked());
-    _mock_unlocked(_mock_seed, sizeof(_mock_seed), NULL);
-    assert_true(keystore_is_locked());
-    _mock_unlocked(_mock_seed, sizeof(_mock_seed), _mock_bip39_seed);
-    assert_false(keystore_is_locked());
-    keystore_lock();
-    assert_true(keystore_is_locked());
-}
-
 static void _test_keystore_create_and_store_seed(void** state)
 {
     const uint8_t seed_random[32] =
@@ -282,7 +258,6 @@ int main(void)
     mock_memory_set_salt_root(_salt_root);
 
     const struct CMUnitTest tests[] = {
-        cmocka_unit_test(_test_keystore_lock),
         cmocka_unit_test(_test_keystore_create_and_store_seed),
         cmocka_unit_test(_test_secp256k1_schnorr_sign),
         cmocka_unit_test(_test_keystore_secp256k1_schnorr_sign),