Revert^2 "Move keymint to android.hardware.security."
3d1d8409499201442daa5a58d90c33760edba81e
Bug: 175345910
Bug: 171429297
Change-Id: I3f96d11f7d49e48904ab2ba907ac1c616c0f9684
diff --git a/ng/AndroidKeyMintOperation.cpp b/ng/AndroidKeyMintOperation.cpp
new file mode 100644
index 0000000..bfbce20
--- /dev/null
+++ b/ng/AndroidKeyMintOperation.cpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "android.hardware.security.keymint-impl"
+#include <log/log.h>
+
+#include "AndroidKeyMintOperation.h"
+
+#include <aidl/android/hardware/security/keymint/ErrorCode.h>
+
+#include <keymaster/android_keymaster.h>
+
+#include "KeyMintUtils.h"
+
+namespace aidl::android::hardware::security::keymint {
+
+using ::keymaster::AbortOperationRequest;
+using ::keymaster::AbortOperationResponse;
+using ::keymaster::FinishOperationRequest;
+using ::keymaster::FinishOperationResponse;
+using ::keymaster::UpdateOperationRequest;
+using ::keymaster::UpdateOperationResponse;
+
+AndroidKeyMintOperation::AndroidKeyMintOperation(
+ const shared_ptr<::keymaster::AndroidKeymaster> implementation,
+ keymaster_operation_handle_t opHandle)
+ : impl_(std::move(implementation)), opHandle_(opHandle) {}
+
+AndroidKeyMintOperation::~AndroidKeyMintOperation() {
+ if (opHandle_ != 0) {
+ abort();
+ }
+}
+
+ScopedAStatus AndroidKeyMintOperation::update(const optional<KeyParameterArray>& params,
+ const optional<vector<uint8_t>>& input,
+ const optional<HardwareAuthToken>& /* authToken */,
+ const optional<VerificationToken>&
+ /* verificationToken */,
+ optional<KeyParameterArray>* updatedParams,
+ optional<ByteArray>* output, int32_t* inputConsumed) {
+ if (!updatedParams || !output || !inputConsumed) {
+ return kmError2ScopedAStatus(KM_ERROR_OUTPUT_PARAMETER_NULL);
+ }
+
+ UpdateOperationRequest request;
+ request.op_handle = opHandle_;
+ if (input) {
+ request.input.Reinitialize(input->data(), input->size());
+ }
+
+ if (params) {
+ request.additional_params.Reinitialize(KmParamSet(params->params));
+ }
+
+ UpdateOperationResponse response;
+ impl_->UpdateOperation(request, &response);
+
+ *inputConsumed = 0;
+ if (response.error == KM_ERROR_OK) {
+ *inputConsumed = response.input_consumed;
+
+ updatedParams->emplace();
+ (*updatedParams)->params = kmParamSet2Aidl(response.output_params);
+
+ output->emplace();
+ (*output)->data = kmBuffer2vector(response.output);
+
+ return ScopedAStatus::ok();
+ }
+
+ opHandle_ = 0;
+ return kmError2ScopedAStatus(response.error);
+}
+
+ScopedAStatus AndroidKeyMintOperation::finish(const optional<KeyParameterArray>& params,
+ const optional<vector<uint8_t>>& input,
+ const optional<vector<uint8_t>>& signature,
+ const optional<HardwareAuthToken>& /* authToken */,
+ const optional<VerificationToken>&
+ /* verificationToken */,
+ optional<KeyParameterArray>* updatedParams,
+ vector<uint8_t>* output) {
+
+ if (!updatedParams || !output) {
+ return ScopedAStatus(AStatus_fromServiceSpecificError(
+ static_cast<int32_t>(ErrorCode::OUTPUT_PARAMETER_NULL)));
+ }
+
+ FinishOperationRequest request;
+ request.op_handle = opHandle_;
+
+ if (input) {
+ request.input.Reinitialize(input->data(), input->size());
+ }
+
+ if (signature) {
+ request.signature.Reinitialize(signature->data(), signature->size());
+ }
+
+ if (params) {
+ request.additional_params.Reinitialize(KmParamSet(params->params));
+ }
+
+ FinishOperationResponse response;
+ impl_->FinishOperation(request, &response);
+ opHandle_ = 0;
+
+ if (response.error == KM_ERROR_OK) {
+ updatedParams->emplace();
+ (*updatedParams)->params = kmParamSet2Aidl(response.output_params);
+
+ *output = kmBuffer2vector(response.output);
+ return ScopedAStatus::ok();
+ }
+
+ return kmError2ScopedAStatus(response.error);
+}
+
+ScopedAStatus AndroidKeyMintOperation::abort() {
+ AbortOperationRequest request;
+ request.op_handle = opHandle_;
+
+ AbortOperationResponse response;
+ impl_->AbortOperation(request, &response);
+ opHandle_ = 0;
+
+ return kmError2ScopedAStatus(response.error);
+}
+
+} // namespace aidl::android::hardware::security::keymint