commit 97455f85b056cc38d3fdccb0d7fea11044eacf15
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 19:13:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 19:13:28 2021 +0000
tree 57c148f5de6bfce01ae700f1048938f49c79476f
parent 0e9eb8ebca99dbdc7849301df8087183734b231a
parent d2bb3675491a293741650cc122c5221b5cc8034c

Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549

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

Change-Id: Ib91a29bf3d216c09ece619b9554c8f391efbe5fd

Keymaster.cpp

diff --git a/Keymaster.cpp b/Keymaster.cpp
index be282dd..1d69dde 100644
--- a/Keymaster.cpp
+++ b/Keymaster.cpp
@@ -82,14 +82,7 @@
             ks2Operation = nullptr;
             return false;
         }
-
-        if (!output) {
-            LOG(ERROR) << "Keystore2 operation update didn't return output.";
-            ks2Operation = nullptr;
-            return false;
-        }
-
-        consumer((const char*)output->data(), output->size());
+        if (output) consumer((const char*)output->data(), output->size());
     }
     return true;
 }