diff options
| author | Janis Danisevskis <jdanis@google.com> | 2020-12-16 18:28:39 -0800 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2020-12-17 11:34:59 -0700 |
| commit | 24c04704082dbf51ba6406ccb9e6f2f7497b4fd9 (patch) | |
| tree | 06e36b68a10655393cbac5b3098e496fab5f72d6 /security/keymint/support/authorization_set.cpp | |
| parent | 276369a3df24748deff21e5414b34ef6eb12b8a8 (diff) | |
Keymint: Use ndk_platform.
Test: N/A
Change-Id: I7e97d9d475a639cfe92c9e6b01689c9ff80d2abc
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 |