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
This commit is contained in:
Treehugger Robot 2021-04-26 20:27:50 +00:00 committed by Automerger Merge Worker
commit ee2f2e081d

View file

@ -82,14 +82,7 @@ bool KeymasterOperation::updateCompletely(const char* input, size_t inputLen,
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;
}