widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WVDrmPlugin signRSA: check arguments before caller am: 2278917116

Browse Source 
Change-Id: Iaaf830cd60c417bbc595a175d901a6088861eab0
This commit is contained in:
Robert Shih
2020-04-08 20:08:44 +00:00
committed by Automerger Merge Worker
parent 379127929e 2278917116
commit 1659f38dd4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -1732,6 +1732,12 @@ Return<void> WVDrmPlugin::signRSA(
const hidl_vec<uint8_t>& wrappedKey, const hidl_vec<uint8_t>& wrappedKey,
signRSA_cb _hidl_cb) { signRSA_cb _hidl_cb) {
if (sessionId.size() == 0 || algorithm.size() == 0 ||
message.size() == 0 || wrappedKey.size() == 0) {
_hidl_cb(Status::BAD_VALUE, hidl_vec<uint8_t>());
return Void();
}
const auto& self = android::hardware::IPCThreadState::self(); const auto& self = android::hardware::IPCThreadState::self();
const char* sid = self->getCallingSid(); const char* sid = self->getCallingSid();
if (!sid || (!strstr(sid, "mediashell_app") && !strstr(sid, "mediadrmserver"))) { if (!sid || (!strstr(sid, "mediashell_app") && !strstr(sid, "mediadrmserver"))) {
@@ -1740,11 +1746,6 @@ Return<void> WVDrmPlugin::signRSA(
return Void(); return Void();
} }
if (sessionId.size() == 0 || algorithm.size() == 0 ||
message.size() == 0 || wrappedKey.size() == 0) {
_hidl_cb(Status::BAD_VALUE, hidl_vec<uint8_t>());
return Void();
}
const std::string algo(algorithm.c_str()); const std::string algo(algorithm.c_str());
std::vector<uint8_t> signature; std::vector<uint8_t> signature;