commit 64ce88543b9b1a31f94432339ef4d2a686fdd133
author Keun-young Park <keunyoung@google.com> Thu Oct 14 22:01:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 14 22:01:15 2021 +0000
tree e6926e0bc7b8f646aea9520d808f10a8bccc8b84
parent b6c257d37fdf8d906eb010702bbdf2e3e65b7ba1
parent d9f2335ab719dee3091420ec5665609f451a928b

Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0 am: d9f2335ab7

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I1807a992b19e8f8fffd7425a5cc390e358b7c0d8

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 50bba56..ebaefa3 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -383,9 +383,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;
@@ -414,7 +412,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;