[vbmeta][test] Use testkeys from avb directly in tests
Bug: 256148034
Test: atest libvbmeta_rust.test
Change-Id: Ieeb611dbc747839e4e10badfbc55a022a8bf96de
diff --git a/libs/vbmeta/src/lib.rs b/libs/vbmeta/src/lib.rs
index 887844c..8e81ea4 100644
--- a/libs/vbmeta/src/lib.rs
+++ b/libs/vbmeta/src/lib.rs
@@ -238,7 +238,7 @@
Ok(())
}
- fn test_signed_image(algorithm: &str, key: &str) -> Result<()> {
+ fn signed_image_has_valid_vbmeta(algorithm: &str, key: &str) -> Result<()> {
let test_dir = TempDir::new().unwrap();
let test_file = test_dir.path().join("test.img");
let mut cmd = Command::new("./avbtool");
@@ -289,16 +289,16 @@
#[test]
fn test_rsa2048_signed_image() -> Result<()> {
- test_signed_image("SHA256_RSA2048", "tests/data/testkey_rsa2048.pem")
+ signed_image_has_valid_vbmeta("SHA256_RSA2048", "data/testkey_rsa2048.pem")
}
#[test]
fn test_rsa4096_signed_image() -> Result<()> {
- test_signed_image("SHA256_RSA4096", "tests/data/testkey_rsa4096.pem")
+ signed_image_has_valid_vbmeta("SHA256_RSA4096", "data/testkey_rsa4096.pem")
}
#[test]
fn test_rsa8192_signed_image() -> Result<()> {
- test_signed_image("SHA256_RSA8192", "tests/data/testkey_rsa8192.pem")
+ signed_image_has_valid_vbmeta("SHA256_RSA8192", "data/testkey_rsa8192.pem")
}
}