Merge "Allow delayed error code in generic crypto" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-30 21:06:17 +00:00
committed by Android (Google) Code Review

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);
}