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

Enable OEMCrypto_MoveEntry/ReuseUsageEntry fuzzers

Browse Source 
Merged from https://widevine-internal-review.googlesource.com/174893

Change-Id: Ia46e74450bc20302edaf1c5e2bbde957a1d31c95
This commit is contained in:
Ian Benz
2023-05-10 19:46:16 +00:00
committed by Robert Shih
parent 8a4160bf8a
commit 31a2f09792
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_move_usage_entry_fuzz.cc
View File

@@ -2,6 +2,7 @@
// source code may only be used and distributed under the Widevine Master // source code may only be used and distributed under the Widevine Master
// License Agreement. // License Agreement.
#include "FuzzedDataProvider.h"
#include "OEMCryptoCENC.h" #include "OEMCryptoCENC.h"
#include "oemcrypto_fuzz_helper.h" #include "oemcrypto_fuzz_helper.h"
@@ -19,12 +20,6 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
} }
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
uint32_t usage_entry_number;
if (size < sizeof(usage_entry_number)) {
return 0;
}
memcpy(&usage_entry_number, data, sizeof(usage_entry_number));
entry.CreateUsageTableHeader(); entry.CreateUsageTableHeader();
wvoec::Session* s = entry.license_messages().session(); wvoec::Session* s = entry.license_messages().session();
s->open(); s->open();
@@ -32,7 +27,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
s->CreateNewUsageEntry(); s->CreateNewUsageEntry();
std::vector<uint8_t> encrypted_usage_header; std::vector<uint8_t> encrypted_usage_header;
s->UpdateUsageEntry(&encrypted_usage_header); s->UpdateUsageEntry(&encrypted_usage_header);
OEMCrypto_MoveEntry(s->session_id(), usage_entry_number); s->close();
s->open();
s->ReloadUsageEntry();
OEMCrypto_MoveEntry(
s->session_id(),
FuzzedDataProvider(data, size).ConsumeIntegral<uint32_t>());
s->close(); s->close();
return 0; return 0;

12
libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_reuse_usage_entry_fuzz.cc
View File

@@ -2,6 +2,7 @@
// source code may only be used and distributed under the Widevine Master // source code may only be used and distributed under the Widevine Master
// License Agreement. // License Agreement.
#include "FuzzedDataProvider.h"
#include "OEMCryptoCENC.h" #include "OEMCryptoCENC.h"
#include "oemcrypto_fuzz_helper.h" #include "oemcrypto_fuzz_helper.h"
@@ -19,20 +20,17 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
} }
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
uint32_t usage_entry_number;
if (size < sizeof(usage_entry_number)) {
return 0;
}
memcpy(&usage_entry_number, data, sizeof(usage_entry_number));
entry.CreateUsageTableHeader(); entry.CreateUsageTableHeader();
wvoec::Session* s = entry.license_messages().session(); wvoec::Session* s = entry.license_messages().session();
s->open(); s->open();
entry.InstallTestDrmKey(s); entry.InstallTestDrmKey(s);
s->CreateNewUsageEntry(); s->CreateNewUsageEntry();
s->close(); s->close();
s->open(); s->open();
OEMCrypto_ReuseUsageEntry(s->session_id(), usage_entry_number); OEMCrypto_ReuseUsageEntry(
s->session_id(),
FuzzedDataProvider(data, size).ConsumeIntegral<uint32_t>());
s->close(); s->close();
return 0; return 0;