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

Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I8a8884b0139ca407050b5d399a069096b1d5b4d1
This commit is contained in:
Fred Gylys-Colwell
2020-06-02 22:15:49 +00:00
committed by Automerger Merge Worker
parent 38d465b042 23f9a69a7f
commit d4f0d69923
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -2203,10 +2203,11 @@ class OEMCryptoSessionTestsDecryptTests
void TestDecryptCENC() { void TestDecryptCENC() {
OEMCryptoResult sts; OEMCryptoResult sts;
// OEMCrypto only supports providing a decrypt hash for one sample.
if (samples_.size() > 1) verify_crc_ = false;
// If supported, check the decrypt hashes. // If supported, check the decrypt hashes.
if (verify_crc_) { if (verify_crc_) {
// OEMCrypto only supports providing a decrypt hash for the first sample
// in the sample array.
const TestSample& sample = samples_[0]; const TestSample& sample = samples_[0];
uint32_t hash = uint32_t hash =
@@ -2261,7 +2262,7 @@ class OEMCryptoSessionTestsDecryptTests
} }
} }
} }
if (global_features.supports_crc) { if (verify_crc_) {
uint32_t frame; uint32_t frame;
ASSERT_EQ(OEMCrypto_GetHashErrorCode(session_.session_id(), &frame), ASSERT_EQ(OEMCrypto_GetHashErrorCode(session_.session_id(), &frame),
OEMCrypto_SUCCESS); OEMCrypto_SUCCESS);