commit 4fb97923e5bc781245594e7b422eb2e127c6648d
author Keith Mok <keithmok@google.com> Wed Sep 08 22:25:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 08 22:25:19 2021 +0000
tree 1ae51f21ff6bf877bc422fe79e70d048187e76d8
parent 28f635a556bdb7cb3e77331329ed97ca9d60242b
parent 143b0df2dfa46118550beb9dd8acf6eb5ac13bb9

Merge "Set a property if seed binding is enabled." into sc-v2-dev

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 93ad65b..11045a4 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -379,9 +379,7 @@
                                     const km::AuthorizationSet& keyParams,
                                     const KeyBuffer& message, std::string* ciphertext) {
     km::AuthorizationSet opParams =
-            km::AuthorizationSetBuilder()
-                    .Authorization(km::TAG_ROLLBACK_RESISTANCE)
-                    .Authorization(km::TAG_PURPOSE, km::KeyPurpose::ENCRYPT);
+            km::AuthorizationSetBuilder().Authorization(km::TAG_PURPOSE, km::KeyPurpose::ENCRYPT);
     km::AuthorizationSet outParams;
     auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, &outParams);
     if (!opHandle) return false;
@@ -410,7 +408,6 @@
     auto bodyAndMac = ciphertext.substr(GCM_NONCE_BYTES);
     auto opParams = km::AuthorizationSetBuilder()
                             .Authorization(km::TAG_NONCE, nonce)
-                            .Authorization(km::TAG_ROLLBACK_RESISTANCE)
                             .Authorization(km::TAG_PURPOSE, km::KeyPurpose::DECRYPT);
     auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, nullptr);
     if (!opHandle) return false;