commit ee2f2e081da301b4bf7c2888618f70985bb6746f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 20:27:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 20:27:50 2021 +0000
tree b7578e48b724feaf5f30115540046a5baddcfac1
parent 33f9b160a20dbd219967e40f6bba61e76da443ae
parent f04542fcac80247621c91a0a9a1bb44c76687491

Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549 am: 97455f85b0 am: f04542fcac

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

Change-Id: I0762df0881f194acd1d1a13dc1eae54647ac02f6

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;
 }