From 1ffcdebadd7229af65c575dc1271084b17fe42d7 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Fri, 11 Dec 2020 10:45:43 +0000 Subject: Revert "Move keymint to android.hardware.security." Revert "Keystore 2.0 SPI: Move keymint spec to security namespace." Revert "Keystore 2.0: Move keymint spec to security namespace." Revert "Keystore 2.0: Move keymint spec to security namespace." Revert "Move keymint to android.hardware.security." Revert "Configure CF to start KeyMint service by default." Revert "Move keymint to android.hardware.security." Revert "Move keymint to android.hardware.security." Revert submission 1522123-move_keymint Reason for revert: Build breakage Bug: 175345910 Bug: 171429297 Reverted Changes: Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp... Idb54e8846:Keystore 2.0: Move keymint spec to security namesp... I9f70db0e4:Remove references to keymint1 I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na... I2498073aa:Move keymint to android.hardware.security. I098711e7d:Move keymint to android.hardware.security. I3ec8d70fe:Configure CF to start KeyMint service by default. Icbb373c50:Move keymint to android.hardware.security. I86bccf40e:Move keymint to android.hardware.security. Change-Id: I160cae568ed6b15698bd0af0b19c6c949528762d --- security/keymint/support/key_param_output.cpp | 72 --------------------------- 1 file changed, 72 deletions(-) delete mode 100644 security/keymint/support/key_param_output.cpp (limited to 'security/keymint/support/key_param_output.cpp') diff --git a/security/keymint/support/key_param_output.cpp b/security/keymint/support/key_param_output.cpp deleted file mode 100644 index b699b2289e..0000000000 --- a/security/keymint/support/key_param_output.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ - -#include - -#include - -#include - -namespace android::hardware::security::keymint { - -using ::std::endl; -using ::std::ostream; - -ostream& operator<<(ostream& os, const ::std::vector& set) { - if (set.size() == 0) { - os << "(Empty)" << endl; - } else { - os << "\n"; - for (const auto& elem : set) os << elem << endl; - } - return os; -} - -// TODO(seleneh) update this to a parsing that looks at each tags individually -// such as ALGORITHM BLOCK_MODE when aidl union support is added. -ostream& operator<<(ostream& os, const KeyParameter& param) { - os << param.tag << ": "; - switch (typeFromTag(param.tag)) { - case TagType::INVALID: - return os << " Invalid"; - case TagType::ENUM_REP: - case TagType::ENUM: - case TagType::UINT_REP: - case TagType::UINT: - return os << param.integer; - case TagType::ULONG_REP: - case TagType::ULONG: - case TagType::DATE: - return os << param.longInteger; - case TagType::BOOL: - return os << "true"; - case TagType::BIGNUM: - os << " Bignum: "; - for (size_t i = 0; i < param.blob.size(); ++i) { - os << std::hex << ::std::setw(2) << static_cast(param.blob[i]) << ::std::dec; - } - return os; - case TagType::BYTES: - os << " Bytes: "; - for (size_t i = 0; i < param.blob.size(); ++i) { - os << ::std::hex << ::std::setw(2) << static_cast(param.blob[i]) << ::std::dec; - } - return os; - } - return os << "UNKNOWN TAG TYPE!"; -} - -} // namespace android::hardware::security::keymint -- cgit v1.2.3