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: Ifee521bb4f499e77b7a5d9b650c1ba6c3c683649
BUG: 176867651
diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp
index f024fef..8656c66 100644
--- a/ng/AndroidKeyMintDevice.cpp
+++ b/ng/AndroidKeyMintDevice.cpp
@@ -62,7 +62,7 @@
const HardwareAuthToken& authToken, //
VerificationToken* verificationToken) {
- VerifyAuthorizationRequest request(impl_->message_version());
+ VerifyAuthorizationRequest request;
request.challenge = static_cast<uint64_t>(challenge);
request.auth_token.challenge = authToken.challenge;
request.auth_token.user_id = authToken.userId;
@@ -93,10 +93,10 @@
return ScopedAStatus::ok();
}
- AddEntropyRequest request(impl_->message_version());
+ AddEntropyRequest request;
request.random_data.Reinitialize(data.data(), data.size());
- AddEntropyResponse response(impl_->message_version());
+ AddEntropyResponse response;
impl_->AddRngEntropy(request, &response);
return kmError2ScopedAStatus(response.error);
@@ -107,10 +107,10 @@
KeyCharacteristics* generatedKeyCharacteristics,
vector<Certificate>* /* certChain */) {
- GenerateKeyRequest request(impl_->message_version());
+ GenerateKeyRequest request;
request.key_description.Reinitialize(KmParamSet(keyParams));
- GenerateKeyResponse response(impl_->message_version());
+ GenerateKeyResponse response;
impl_->GenerateKey(request, &response);
if (response.error != KM_ERROR_OK) {
@@ -139,12 +139,12 @@
KeyCharacteristics* importedKeyCharacteristics,
vector<Certificate>* /* certChain */) {
- ImportKeyRequest request(impl_->message_version());
+ ImportKeyRequest request;
request.key_description.Reinitialize(KmParamSet(keyParams));
request.key_format = legacy_enum_conversion(keyFormat);
request.SetKeyMaterial(keyData.data(), keyData.size());
- ImportKeyResponse response(impl_->message_version());
+ ImportKeyResponse response;
impl_->ImportKey(request, &response);
if (response.error != KM_ERROR_OK) {
@@ -164,7 +164,7 @@
int64_t passwordSid, int64_t biometricSid, ByteArray* importedKeyBlob,
KeyCharacteristics* importedKeyCharacteristics) {
- ImportWrappedKeyRequest request(impl_->message_version());
+ ImportWrappedKeyRequest request;
request.SetWrappedMaterial(wrappedKeyData.data(), wrappedKeyData.size());
request.SetWrappingMaterial(wrappingKeyBlob.data(), wrappingKeyBlob.size());
request.SetMaskingKeyMaterial(maskingKey.data(), maskingKey.size());
@@ -172,7 +172,7 @@
request.password_sid = static_cast<uint64_t>(passwordSid);
request.biometric_sid = static_cast<uint64_t>(biometricSid);
- ImportWrappedKeyResponse response(impl_->message_version());
+ ImportWrappedKeyResponse response;
impl_->ImportWrappedKey(request, &response);
if (response.error != KM_ERROR_OK) {
@@ -190,11 +190,11 @@
const vector<KeyParameter>& upgradeParams,
vector<uint8_t>* keyBlob) {
- UpgradeKeyRequest request(impl_->message_version());
+ UpgradeKeyRequest request;
request.SetKeyMaterial(keyBlobToUpgrade.data(), keyBlobToUpgrade.size());
request.upgrade_params.Reinitialize(KmParamSet(upgradeParams));
- UpgradeKeyResponse response(impl_->message_version());
+ UpgradeKeyResponse response;
impl_->UpgradeKey(request, &response);
if (response.error != KM_ERROR_OK) {
@@ -206,10 +206,10 @@
}
ScopedAStatus AndroidKeyMintDevice::deleteKey(const vector<uint8_t>& keyBlob) {
- DeleteKeyRequest request(impl_->message_version());
+ DeleteKeyRequest request;
request.SetKeyMaterial(keyBlob.data(), keyBlob.size());
- DeleteKeyResponse response(impl_->message_version());
+ DeleteKeyResponse response;
impl_->DeleteKey(request, &response);
return kmError2ScopedAStatus(response.error);
@@ -217,8 +217,8 @@
ScopedAStatus AndroidKeyMintDevice::deleteAllKeys() {
// There's nothing to be done to delete software key blobs.
- DeleteAllKeysRequest request(impl_->message_version());
- DeleteAllKeysResponse response(impl_->message_version());
+ DeleteAllKeysRequest request;
+ DeleteAllKeysResponse response;
impl_->DeleteAllKeys(request, &response);
return kmError2ScopedAStatus(response.error);
@@ -232,7 +232,7 @@
const vector<KeyParameter>& params,
const HardwareAuthToken& authToken, BeginResult* result) {
- BeginOperationRequest request(impl_->message_version());
+ BeginOperationRequest request;
request.purpose = legacy_enum_conversion(purpose);
request.SetKeyMaterial(keyBlob.data(), keyBlob.size());
request.additional_params.Reinitialize(KmParamSet(params));
@@ -241,7 +241,7 @@
request.additional_params.push_back(
TAG_AUTH_TOKEN, reinterpret_cast<uint8_t*>(vector_token.data()), vector_token.size());
- BeginOperationResponse response(impl_->message_version());
+ BeginOperationResponse response;
impl_->BeginOperation(request, &response);
if (response.error != KM_ERROR_OK) {