Updated to return INVALID_ARGUMENT on generateKey with invalid domain field.
Bug: 211005249
Test: atest keystore2_client_tests
Change-Id: I1c2a8f66f2e3a6897d5a2bf48b65fb97bcf9903b
diff --git a/keystore2/src/permission.rs b/keystore2/src/permission.rs
index 7b3199c..3cc116b 100644
--- a/keystore2/src/permission.rs
+++ b/keystore2/src/permission.rs
@@ -19,6 +19,7 @@
//! defined by keystore2 and keystore2_key respectively.
use crate::error::Error as KsError;
+use crate::error::ResponseCode;
use android_system_keystore2::aidl::android::system::keystore2::{
Domain::Domain, KeyDescriptor::KeyDescriptor, KeyPermission::KeyPermission,
};
@@ -390,7 +391,7 @@
tctx
}
_ => {
- return Err(KsError::sys())
+ return Err(KsError::Rc(ResponseCode::INVALID_ARGUMENT))
.context(format!("Unknown domain value: \"{:?}\".", key.domain))
}
};