Merge "Adding RSA PKCS1 and EC SEC 1 parsers"
diff --git a/hal/src/lib.rs b/hal/src/lib.rs
index 69490b7..6a94183 100644
--- a/hal/src/lib.rs
+++ b/hal/src/lib.rs
@@ -14,7 +14,7 @@
cbor, cbor_type_error, keymint::ErrorCode, keymint::NEXT_MESSAGE_SIGNAL_TRUE, AsCborValue,
CborError, Code, KeyMintOperation,
};
-use log::{error, info};
+use log::{error, info, warn};
use std::{
ffi::CString,
io::{Read, Write},
@@ -192,7 +192,7 @@
// invoked (IRemotelyProvisionedComponent vs. the rest). However, the OK value is
// the same in all spaces.
if error_code != ErrorCode::Ok as i32 {
- error!("HAL: command {:?} failed: {:?}", <R>::CODE, error_code);
+ warn!("HAL: command {:?} failed: {:?}", <R>::CODE, error_code);
return Err(binder::Status::new_service_specific_error(error_code, None));
}
diff --git a/ta/src/lib.rs b/ta/src/lib.rs
index e2eed15..641bb87 100644
--- a/ta/src/lib.rs
+++ b/ta/src/lib.rs
@@ -1168,7 +1168,7 @@
/// Create a response structure with the given error.
fn op_error_rsp(op: KeyMintOperation, err: Error) -> PerformOpResponse {
- error!("failing {:?} request with error {:?}", op, err);
+ warn!("failing {:?} request with error {:?}", op, err);
if kmr_wire::is_rpc_operation(op) {
// The IRemotelyProvisionedComponent HAL uses a different error space than the
// other HALs.
@@ -1178,19 +1178,13 @@
error!("encountered non-RKP error on RKP method! {:?}", err);
rpc::ErrorCode::Failed
}
- Error::Rpc(e, err_msg) => {
- error!("Returning error code: {:?} in the response due to: {}", e, err_msg);
- e
- }
+ Error::Rpc(e, _) => e,
};
error_rsp(rpc_err as i32)
} else {
let hal_err = match err {
Error::Cbor(_) | Error::Der(_) => ErrorCode::InvalidArgument,
- Error::Hal(e, err_msg) => {
- error!("Returning error code: {:?} in the response due to: {}", e, err_msg);
- e
- }
+ Error::Hal(e, _) => e,
Error::Rpc(_, _) => {
error!("encountered RKP error on non-RKP method! {:?}", err);
ErrorCode::UnknownError
