Revert "Revise KeymasterMessage versioning system"
Revert "Revise KeymasterMessage versioning system"
Revert "Revise KeymasterMessage versioning system"
Revert "Add new message versioning protocol"
Revert submission 1533821-new_km_versioning
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=7064747&lkbb=7064769&fkbb=7064769, bug 176867651
Reverted Changes:
I040fe7f62:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
Ibea104c39:Revise KeymasterMessage versioning system
I425fb45fc:Add new message versioning protocol
Change-Id: I1569334c59cb62be6aae4a42ce999f40c7a472de
BUG: 176867651
diff --git a/trusty/keymaster/TrustyKeymaster.cpp b/trusty/keymaster/TrustyKeymaster.cpp
index 5690031..750a9d7 100644
--- a/trusty/keymaster/TrustyKeymaster.cpp
+++ b/trusty/keymaster/TrustyKeymaster.cpp
@@ -31,35 +31,11 @@
return err;
}
- // Try GetVersion2 first.
- GetVersion2Request versionReq;
- GetVersion2Response versionRsp = GetVersion2(versionReq);
- if (versionRsp.error != KM_ERROR_OK) {
- ALOGW("TA appears not to support GetVersion2, falling back (err = %d)", versionRsp.error);
-
- GetVersionRequest versionReq;
- GetVersionResponse versionRsp;
- GetVersion(versionReq, &versionRsp);
- if (versionRsp.error != KM_ERROR_OK) {
- ALOGE("Failed to get TA version %d", versionRsp.error);
- return -1;
- } else {
- keymaster_error_t error;
- message_version_ = NegotiateMessageVersion(versionRsp, &error);
- if (error != KM_ERROR_OK) {
- ALOGE("Failed to negotiate message version %d", error);
- return -1;
- }
- }
- } else {
- message_version_ = NegotiateMessageVersion(versionReq, versionRsp);
- }
-
- ConfigureRequest req(message_version());
+ ConfigureRequest req;
req.os_version = GetOsVersion();
req.os_patchlevel = GetOsPatchlevel();
- ConfigureResponse rsp(message_version());
+ ConfigureResponse rsp;
Configure(req, &rsp);
if (rsp.error != KM_ERROR_OK) {
@@ -76,7 +52,7 @@
trusty_keymaster_disconnect();
}
-static void ForwardCommand(enum keymaster_command command, const KeymasterMessage& req,
+static void ForwardCommand(enum keymaster_command command, const Serializable& req,
KeymasterResponse* rsp) {
keymaster_error_t err;
err = trusty_keymaster_send(command, req, rsp);
@@ -197,30 +173,25 @@
}
GetHmacSharingParametersResponse TrustyKeymaster::GetHmacSharingParameters() {
- GetHmacSharingParametersRequest request(message_version());
- GetHmacSharingParametersResponse response(message_version());
+ // Empty buffer to allow ForwardCommand to have something to serialize
+ Buffer request;
+ GetHmacSharingParametersResponse response;
ForwardCommand(KM_GET_HMAC_SHARING_PARAMETERS, request, &response);
return response;
}
ComputeSharedHmacResponse TrustyKeymaster::ComputeSharedHmac(
const ComputeSharedHmacRequest& request) {
- ComputeSharedHmacResponse response(message_version());
+ ComputeSharedHmacResponse response;
ForwardCommand(KM_COMPUTE_SHARED_HMAC, request, &response);
return response;
}
VerifyAuthorizationResponse TrustyKeymaster::VerifyAuthorization(
const VerifyAuthorizationRequest& request) {
- VerifyAuthorizationResponse response(message_version());
+ VerifyAuthorizationResponse response;
ForwardCommand(KM_VERIFY_AUTHORIZATION, request, &response);
return response;
}
-GetVersion2Response TrustyKeymaster::GetVersion2(const GetVersion2Request& request) {
- GetVersion2Response response(message_version());
- ForwardCommand(KM_GET_VERSION_2, request, &response);
- return response;
-}
-
} // namespace keymaster