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

Merging Android odk fuzz changes to improve coverage from http://go/wvgerrit/99911

Browse Source 
Test: The changs have been made in google3 and fuzzer has been running
successfully with improved coverage
Critique CL: http://cl/310633618
Bug: b/155435131
Change-Id: Ib02601302db238ce8fbeb3963ce8e05e864ba985

Change-Id: I11eba4d1aa1536b44929b742a5e2c2bf89d818fb
This commit is contained in:
Bharath Chandra Elluru
2020-05-12 16:18:30 -07:00
parent 437e8402ca
commit ac942791c9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libwvdrmengine/oemcrypto/odk/test/fuzzing/odk_fuzz_helper.cpp
View File

@@ -88,15 +88,23 @@ OEMCryptoResult odk_deserialize_RenewalResponse(
OEMCryptoResult err = OEMCryptoResult err =
ODK_ParseRenewal(buf, SIZE_MAX, len, nonce_values, a->system_time, ODK_ParseRenewal(buf, SIZE_MAX, len, nonce_values, a->system_time,
&a->timer_limits, &a->clock_values, &timer_value); &a->timer_limits, &a->clock_values, &timer_value);
if (OEMCrypto_SUCCESS == err) { const bool is_parse_renewal_response_successful =
err == ODK_SET_TIMER || err == ODK_DISABLE_TIMER ||
err == ODK_TIMER_EXPIRED || err == ODK_STALE_RENEWAL;
if (!is_parse_renewal_response_successful) {
return err;
}
// In order to capture playback_time information which is part of
// renewal_msg and will be later used in kdo_serialize_RenewalResponse in
// odk_kdo method, we call Unpack_ODK_PreparedRenewalRequest private method.
// playback_time cannot be captured from publicly exposed API
// ODK_ParseRenewal.
Message* msg = nullptr; Message* msg = nullptr;
AllocateMessage(&msg, message_block); AllocateMessage(&msg, message_block);
InitMessage(msg, const_cast<uint8_t*>(buf), len); InitMessage(msg, const_cast<uint8_t*>(buf), len);
SetSize(msg, len); SetSize(msg, len);
Unpack_ODK_PreparedRenewalRequest(msg, renewal_msg); Unpack_ODK_PreparedRenewalRequest(msg, renewal_msg);
assert(ValidMessage(msg)); return OEMCrypto_SUCCESS;
}
return err;
} }
OEMCryptoResult odk_deserialize_ProvisioningResponse( OEMCryptoResult odk_deserialize_ProvisioningResponse(