commit 235d1d65f8d91ade54251f8132b06414f140054a
author Xin Li <delphij@google.com> Tue Dec 14 20:25:23 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 14 20:25:23 2021 +0000
tree c1678fbd444d906969a8daa3fc4214eee4beef61
parent e8d0e486a39ee07765c7f757ea3c1119bdf4726b
parent 721a879cfe4422c4239695728d7a2f44adcbaaa3

Merge "Merge Android 12 QPR1"

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 007ce66..3ede67e 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -377,9 +377,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 = BeginKeystoreOp(keystore, dir, keyParams, opParams, &outParams);
     if (!opHandle) return false;
@@ -408,7 +406,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 = BeginKeystoreOp(keystore, dir, keyParams, opParams, nullptr);
     if (!opHandle) return false;