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

Add AES-ECB as a supported encryption mode in ECMG

Browse Source
This commit is contained in:
Lu Chen
2021-09-07 18:08:13 -07:00
parent b3a5fff77d
commit c387750897
11 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media_cas_packager_sdk/internal/ecm_serializer_v3.cc
View File

@@ -136,6 +136,8 @@ EcmMetaData::CipherMode ConvertCryptoModeToProtoCipherMode(
return EcmMetaData::AES_OFB;
case CryptoMode::kAesScte:
return EcmMetaData::AES_SCTE52;
case CryptoMode::kAesEcb:
return EcmMetaData::AES_ECB;
case CryptoMode::kInvalid:
default:
LOG(ERROR) << "Unknown crypto mode.";

3
media_cas_packager_sdk/internal/ecm_serializer_v3_test.cc
View File

@@ -274,7 +274,8 @@ INSTANTIATE_TEST_SUITE_P(
std::make_tuple(CryptoMode::kDvbCsa2, EcmMetaData::DVB_CSA2),
std::make_tuple(CryptoMode::kDvbCsa3, EcmMetaData::DVB_CSA3),
std::make_tuple(CryptoMode::kAesOfb, EcmMetaData::AES_OFB),
std::make_tuple(CryptoMode::kAesScte, EcmMetaData::AES_SCTE52)));
std::make_tuple(CryptoMode::kAesScte, EcmMetaData::AES_SCTE52),
std::make_tuple(CryptoMode::kAesEcb, EcmMetaData::AES_ECB)));
TEST_F(EcmSerializerV3Test, SerializeEcmDoubleKey8ByteIvs) {
EcmSerializerV3 ecm_serializer;

1
media_cas_packager_sdk/public/wv_cas_types.h
View File

@@ -30,6 +30,7 @@ enum class CryptoMode : int {
kDvbCsa3 = 3,
kAesOfb = 4,
kAesScte = 5,
kAesEcb = 6,
};
enum class ScramblingLevel : int { kPES = 0, kTS = 1 };