Include module info in dump output
Test: dumpsys android.security.maintenance
Change-Id: If30ef072294d0aa21ddcf0d79399c31fd87e44d2
diff --git a/keystore2/src/maintenance.rs b/keystore2/src/maintenance.rs
index 1a5045e..efac501 100644
--- a/keystore2/src/maintenance.rs
+++ b/keystore2/src/maintenance.rs
@@ -19,7 +19,7 @@
use crate::error::map_km_error;
use crate::error::Error;
use crate::globals::get_keymint_device;
-use crate::globals::{DB, LEGACY_IMPORTER, SUPER_KEY, ENCODED_MODULE_INFO};
+use crate::globals::{DB, ENCODED_MODULE_INFO, LEGACY_IMPORTER, SUPER_KEY};
use crate::ks_err;
use crate::permission::{KeyPerm, KeystorePerm};
use crate::super_key::SuperKeyManager;
@@ -326,6 +326,19 @@
}
writeln!(f)?;
+ // Display module attestation information
+ {
+ let info = ENCODED_MODULE_INFO.read().unwrap();
+ if let Some(info) = info.as_ref() {
+ writeln!(f, "Attested module information (DER-encoded):")?;
+ writeln!(f, " {}", hex::encode(info))?;
+ writeln!(f)?;
+ } else {
+ writeln!(f, "Attested module information not set")?;
+ writeln!(f)?;
+ }
+ }
+
// Display database size information.
match crate::metrics_store::pull_storage_stats() {
Ok(atoms) => {