diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-19 12:54:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-19 12:54:01 +0000 |
| commit | c670b8d592bb1e750dac44566abd61b9a44e01e9 (patch) | |
| tree | 7ee946cd731ad32eaf013386be35d91218f67ace /security/keymint/support/authorization_set.cpp | |
| parent | 14172a0744ec66d6320b59a453b1d9fbb9f2f52f (diff) | |
| parent | 24f8ba41c4fae3687918640bbdaec9fb933447d1 (diff) | |
Merge "Keymint: Use ndk_platform." am: dfe843477b am: 24f8ba41c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e5e0c12977b5cefe4a1df68a0dfb64192af9f12
Diffstat (limited to 'security/keymint/support/authorization_set.cpp')
| -rw-r--r-- | security/keymint/support/authorization_set.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/security/keymint/support/authorization_set.cpp b/security/keymint/support/authorization_set.cpp index e2aac9a3c5..37b6cd1ff3 100644 --- a/security/keymint/support/authorization_set.cpp +++ b/security/keymint/support/authorization_set.cpp @@ -16,19 +16,13 @@ #include <keymint_support/authorization_set.h> -#include <assert.h> -#include <sstream> +#include <aidl/android/hardware/security/keymint/Algorithm.h> +#include <aidl/android/hardware/security/keymint/BlockMode.h> +#include <aidl/android/hardware/security/keymint/Digest.h> +#include <aidl/android/hardware/security/keymint/KeyParameter.h> +#include <aidl/android/hardware/security/keymint/KeyPurpose.h> -#include <android-base/logging.h> - -#include <android/hardware/security/keymint/Algorithm.h> -#include <android/hardware/security/keymint/BlockMode.h> -#include <android/hardware/security/keymint/Digest.h> -#include <android/hardware/security/keymint/KeyParameter.h> -#include <android/hardware/security/keymint/KeyPurpose.h> -#include <android/hardware/security/keymint/TagType.h> - -namespace android::hardware::security::keymint { +namespace aidl::android::hardware::security::keymint { void AuthorizationSet::Sort() { std::sort(data_.begin(), data_.end()); @@ -218,7 +212,7 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::GcmModeMacLen(uint32_t macLeng } AuthorizationSetBuilder& AuthorizationSetBuilder::BlockMode( - std::initializer_list<android::hardware::security::keymint::BlockMode> blockModes) { + std::initializer_list<aidl::android::hardware::security::keymint::BlockMode> blockModes) { for (auto mode : blockModes) { push_back(TAG_BLOCK_MODE, mode); } @@ -240,4 +234,4 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::Padding( return *this; } -} // namespace android::hardware::security::keymint +} // namespace aidl::android::hardware::security::keymint |