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

Snap for 7398294 from 20833734e1 to sc-release

Browse Source 
Change-Id: I139792d552e6879234561e72fc854be761a9bd06
This commit is contained in:
android-build-team Robot
2021-05-26 01:19:18 +00:00
parent ce46960cb9 20833734e1
commit 6b27739fc2
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/core/test/duration_use_case_test.cpp
View File

@@ -358,8 +358,10 @@ class CdmDurationTest : public WvCdmTestBaseWithEngine,
// this tests a cyan bar with a black X. This assumes that |cutoff| is before // this tests a cyan bar with a black X. This assumes that |cutoff| is before
// |stop|. Both |start| and |cutoff| are system times. // |stop|. Both |start| and |cutoff| are system times.
void TerminatePlayback(uint64_t start, uint64_t cutoff) { void TerminatePlayback(uint64_t start, uint64_t cutoff) {
ASSERT_LT(start, cutoff); // We subtract some fudge from the cutoff to account for possible round off
AllowPlayback(start, cutoff); // error when computing the playback window.
ASSERT_LT(start, cutoff - kFudge);
AllowPlayback(start, cutoff - kFudge);
SleepUntil(cutoff + kFudge); SleepUntil(cutoff + kFudge);
FailDecrypt(); FailDecrypt();
} }

9
libwvdrmengine/oemcrypto/test/fuzz_tests/build_oemcrypto_fuzztests
View File

@@ -4,13 +4,16 @@ set -ex
export CXX=clang++ export CXX=clang++
export CC=clang export CC=clang
export GYP_DEFINES="$GYP_DEFINES clang=1" export GYP_DEFINES="$GYP_DEFINES clang=1"
export PATH_TO_CDM_DIR=. export PATH_TO_CDM_DIR=.
gyp --format=ninja --depth=$(pwd) oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gyp export PYTHONPATH="$PYTHONPATH:$PATH_TO_CDM_DIR/third_party"
python3 $PATH_TO_CDM_DIR/third_party/gyp/__init__.py --format=ninja \
--depth=$(pwd) oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gyp
ninja -C out/Default ninja -C out/Default
# oemcrypto_odkitee_fuzztests.gypi has flags to instrument all the gyp targets # oemcrypto_odkitee_fuzztests.gypi has flags to instrument all the gyp targets
# with fuzzer flags. # with fuzzer flags.
gyp --format=ninja --depth=$(pwd) \ python3 $PATH_TO_CDM_DIR/third_party/gyp/__init__.py --format=ninja \
--depth=$(pwd) \
--include=oemcrypto/test/fuzz_tests/oemcrypto_odkitee_fuzztests.gypi \ --include=oemcrypto/test/fuzz_tests/oemcrypto_odkitee_fuzztests.gypi \
oemcrypto/test/fuzz_tests/oemcrypto_odkitee_fuzztests.gyp oemcrypto/test/fuzz_tests/oemcrypto_odkitee_fuzztests.gyp
ninja -C out/Default ninja -C out/Default

2
libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_load_license_fuzz.cc
View File

@@ -20,7 +20,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
// Convert OEMCrypto_LicenseType in core_response to a valid enum value. // Convert OEMCrypto_LicenseType in core_response to a valid enum value.
ConvertDataToValidEnum( ConvertDataToValidEnum(
OEMCrypto_LicenstType_MaxValue, OEMCrypto_LicenseType_MaxValue,
&license_api_fuzz.license_messages().core_response().license_type); &license_api_fuzz.license_messages().core_response().license_type);
license_api_fuzz.license_messages().EncryptAndSignResponse(); license_api_fuzz.license_messages().EncryptAndSignResponse();