Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f am: d4f0d69923
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948 Change-Id: I9ace6783f1bcdde706c83d6768826b0187378a97
This commit is contained in:
committed by
Automerger Merge Worker
commit
9e4bdda1a5
@@ -2203,10 +2203,11 @@ class OEMCryptoSessionTestsDecryptTests
|
||||
void TestDecryptCENC() {
|
||||
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 (verify_crc_) {
|
||||
// OEMCrypto only supports providing a decrypt hash for the first sample
|
||||
// in the sample array.
|
||||
const TestSample& sample = samples_[0];
|
||||
|
||||
uint32_t hash =
|
||||
@@ -2261,7 +2262,7 @@ class OEMCryptoSessionTestsDecryptTests
|
||||
}
|
||||
}
|
||||
}
|
||||
if (global_features.supports_crc) {
|
||||
if (verify_crc_) {
|
||||
uint32_t frame;
|
||||
ASSERT_EQ(OEMCrypto_GetHashErrorCode(session_.session_id(), &frame),
|
||||
OEMCrypto_SUCCESS);
|
||||
|
||||
Reference in New Issue
Block a user