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

Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: 0daff1c13d

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

Change-Id: I950208cfb53f345b3fbd9f102c435249f1cac759
This commit is contained in:
TreeHugger Robot
2021-06-30 21:24:54 +00:00
committed by Automerger Merge Worker
parent 25e69c97fb 0daff1c13d
commit f850cd9b84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp
View File

@@ -115,7 +115,7 @@ TEST_F(WvGenericCryptoTest, GenericEncryptNoKey) {
cdm_sts = cdm_engine_.GenericEncrypt(
holder_.session_id(), in_buffer_, key_id, iv_,
wvcdm::kEncryptionAlgorithmAesCbc128, &out_buffer);
EXPECT_EQ(NO_CONTENT_KEY_2, cdm_sts);
EXPECT_NE(NO_ERROR, cdm_sts);
EXPECT_NE(encrypted, out_buffer);
}
@@ -158,7 +158,7 @@ TEST_F(WvGenericCryptoTest, GenericDecryptNoKey) {
cdm_sts = cdm_engine_.GenericDecrypt(
holder_.session_id(), in_buffer_, key_id, iv_,
wvcdm::kEncryptionAlgorithmAesCbc128, &out_buffer);
EXPECT_EQ(NO_CONTENT_KEY_2, cdm_sts);
EXPECT_NE(NO_ERROR, cdm_sts);
EXPECT_NE(decrypted, out_buffer);
}