keystore: port _test_keystore_secp256k1_nonce_commit to Rust

Author: benma

src/rust/bitbox02/src/keystore.rs

@@ -401,6 +401,24 @@ mod tests {
             .is_ok());
     }
 
+    #[test]
+    fn test_secp256k1_nonce_commit() {
+        lock();
+        let keypath = [44 + HARDENED, 0 + HARDENED, 0 + HARDENED, 0, 5];
+        let msg = [0x88u8; 32];
+        let host_commitment = [0xabu8; 32];
+
+        // Fails because keystore is locked.
+        assert!(secp256k1_nonce_commit(&keypath, &msg, &host_commitment).is_err());
+
+        mock_unlocked();
+        let client_commitment = secp256k1_nonce_commit(&keypath, &msg, &host_commitment).unwrap();
+        assert_eq!(
+            hex::encode(client_commitment),
+            "0381e4136251c87f2947b735159c6dd644a7b58d35b437e20c878e5129f1320e5e",
+        );
+    }
+
     #[test]
     fn test_bip39_mnemonic_to_seed() {
         assert!(bip39_mnemonic_to_seed("invalid").is_err());

test/unit-test/test_keystore.c

@@ -52,14 +52,6 @@ static uint8_t _mock_bip39_seed[64] = {
     0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
 };
 
-static const uint32_t _keypath[] = {
-    44 + BIP32_INITIAL_HARDENED_CHILD,
-    0 + BIP32_INITIAL_HARDENED_CHILD,
-    0 + BIP32_INITIAL_HARDENED_CHILD,
-    0,
-    5,
-};
-
 // Same as Python:
 // import hmac, hashlib; hmac.digest(b"unit-test", b"password", hashlib.sha256).hex()
 // See also: securechip_mock.c
@@ -112,39 +104,6 @@ void _mock_unlocked(const uint8_t* seed, size_t seed_len, const uint8_t* bip39_s
     keystore_mock_unlocked(seed, seed_len, bip39_seed);
 }
 
-static void _test_keystore_secp256k1_nonce_commit(void** state)
-{
-    uint8_t msg[32] = {0};
-    memset(msg, 0x88, sizeof(msg));
-    uint8_t client_commitment[EC_PUBLIC_KEY_LEN] = {0};
-    uint8_t host_commitment[32] = {0};
-    memset(host_commitment, 0xAB, sizeof(host_commitment));
-
-    {
-        _mock_unlocked(NULL, 0, NULL);
-        // fails because keystore is locked
-        assert_false(keystore_secp256k1_nonce_commit(
-            _keypath,
-            sizeof(_keypath) / sizeof(uint32_t),
-            msg,
-            host_commitment,
-            client_commitment));
-    }
-    {
-        _mock_unlocked(_mock_seed, sizeof(_mock_seed), _mock_bip39_seed);
-        assert_true(keystore_secp256k1_nonce_commit(
-            _keypath,
-            sizeof(_keypath) / sizeof(uint32_t),
-            msg,
-            host_commitment,
-            client_commitment));
-        const uint8_t expected_commitment[EC_PUBLIC_KEY_LEN] =
-            "\x02\xfd\xcf\x79\xf9\xc0\x3f\x6a\xcc\xc6\x56\x95\xa1\x90\x82\xe3\x0b\xfb\x9e\xdc\x93"
-            "\x04\x5a\x03\x05\x8a\x99\x09\xe4\x9b\x1a\x37\x7b";
-        assert_memory_equal(expected_commitment, client_commitment, sizeof(client_commitment));
-    }
-}
-
 static void _expect_encrypt_and_store_seed(void)
 {
     will_return(__wrap_memory_is_initialized, false);
@@ -323,7 +282,6 @@ int main(void)
     mock_memory_set_salt_root(_salt_root);
 
     const struct CMUnitTest tests[] = {
-        cmocka_unit_test(_test_keystore_secp256k1_nonce_commit),
         cmocka_unit_test(_test_keystore_lock),
         cmocka_unit_test(_test_keystore_create_and_store_seed),
         cmocka_unit_test(_test_secp256k1_schnorr_sign),