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

Merge "Fix IV handling for pattern encryption."

Browse Source
This commit is contained in:
John Bruce
2019-01-17 03:07:56 +00:00
committed by Android (Google) Code Review
parent 0c194ff115 ff7f8c00bf
commit cfe7221d9e
4 changed files with 20 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h
View File

@@ -50,8 +50,6 @@ class WVCryptoPlugin : public android::CryptoPlugin {
android::status_t attemptDecrypt( android::status_t attemptDecrypt(
const wvcdm::CdmDecryptionParameters& params, const wvcdm::CdmDecryptionParameters& params,
bool haveEncryptedSubsamples, android::AString* errorDetailMsg); bool haveEncryptedSubsamples, android::AString* errorDetailMsg);
static wvcdm::CdmResponseType countEncryptedBlocksInPatternedRange(
size_t range, const Pattern& pattern, uint64_t* result);
static void incrementIV(uint64_t increaseBy, std::vector<uint8_t>* ivPtr); static void incrementIV(uint64_t increaseBy, std::vector<uint8_t>* ivPtr);
}; };

2
libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h
View File

@@ -72,8 +72,6 @@ struct WVCryptoPlugin : public ICryptoPlugin {
Status_V1_2 attemptDecrypt( Status_V1_2 attemptDecrypt(
const wvcdm::CdmDecryptionParameters& params, const wvcdm::CdmDecryptionParameters& params,
bool haveEncryptedSubsamples, std::string* errorDetailMsg); bool haveEncryptedSubsamples, std::string* errorDetailMsg);
static wvcdm::CdmResponseType countEncryptedBlocksInPatternedRange(
size_t range, const Pattern& pattern, uint64_t* result);
static void incrementIV(uint64_t increaseBy, std::vector<uint8_t>* ivPtr); static void incrementIV(uint64_t increaseBy, std::vector<uint8_t>* ivPtr);
}; };

36
libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp
View File

@@ -234,12 +234,16 @@ ssize_t WVCryptoPlugin::decrypt(bool secure, const uint8_t key[KEY_ID_SIZE],
increment = (blockOffset + subSample.mNumBytesOfEncryptedData) / increment = (blockOffset + subSample.mNumBytesOfEncryptedData) /
kAESBlockSize; kAESBlockSize;
} else { } else {
CdmResponseType countRes = countEncryptedBlocksInPatternedRange( const uint64_t numBlocks =
subSample.mNumBytesOfEncryptedData, pattern, &increment); subSample.mNumBytesOfEncryptedData / kAESBlockSize;
if (!isCdmResponseTypeSuccess(countRes)) { const uint64_t patternLengthInBlocks =
// Swallow the specifics of the error to obscure decrypt internals. pattern.mEncryptBlocks + pattern.mSkipBlocks;
return kErrorCDMGeneric; increment =
} (numBlocks / patternLengthInBlocks) * pattern.mEncryptBlocks;
// A partial pattern is only encrypted if it is at least
// mEncryptBlocks large.
if (numBlocks % patternLengthInBlocks >= pattern.mEncryptBlocks)
increment += pattern.mEncryptBlocks;
} }
incrementIV(increment, &ivVector); incrementIV(increment, &ivVector);
@@ -348,26 +352,6 @@ status_t WVCryptoPlugin::attemptDecrypt(const CdmDecryptionParameters& params,
} }
} }
CdmResponseType WVCryptoPlugin::countEncryptedBlocksInPatternedRange(
size_t range, const Pattern& pattern, uint64_t* result) {
if (result == NULL || range % kAESBlockSize != 0) {
return wvcdm::UNKNOWN_ERROR;
}
const size_t patternLength = pattern.mEncryptBlocks + pattern.mSkipBlocks;
uint64_t encryptedBlocksPassed = 0;
size_t patternPosition = 0;
for (size_t remaining = range / kAESBlockSize; remaining > 0; --remaining) {
if (patternPosition < pattern.mEncryptBlocks) {
++encryptedBlocksPassed;
}
patternPosition = (patternPosition + 1) % patternLength;
}
*result = encryptedBlocksPassed;
return wvcdm::NO_ERROR;
}
void WVCryptoPlugin::incrementIV(uint64_t increaseBy, vector<uint8_t>* ivPtr) { void WVCryptoPlugin::incrementIV(uint64_t increaseBy, vector<uint8_t>* ivPtr) {
vector<uint8_t>& iv = *ivPtr; vector<uint8_t>& iv = *ivPtr;
uint64_t* counterBuffer = reinterpret_cast<uint64_t*>(&iv[8]); uint64_t* counterBuffer = reinterpret_cast<uint64_t*>(&iv[8]);

38
libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
View File

@@ -338,14 +338,16 @@ Return<void> WVCryptoPlugin::decrypt_1_2(
increment = (blockOffset + subSample.numBytesOfEncryptedData) / increment = (blockOffset + subSample.numBytesOfEncryptedData) /
kAESBlockSize; kAESBlockSize;
} else { } else {
CdmResponseType countRes = countEncryptedBlocksInPatternedRange( const uint64_t numBlocks =
subSample.numBytesOfEncryptedData, pattern, &increment); subSample.numBytesOfEncryptedData / kAESBlockSize;
if (!isCdmResponseTypeSuccess(countRes)) { const uint64_t patternLengthInBlocks =
// Swallow the specifics of the error to obscure decrypt internals. pattern.encryptBlocks + pattern.skipBlocks;
_hidl_cb(Status_V1_2::ERROR_DRM_CANNOT_HANDLE, 0, increment =
"Error decrypting data: unknown error"); (numBlocks / patternLengthInBlocks) * pattern.encryptBlocks;
return Void(); // A partial pattern is only encrypted if it is at least
} // mEncryptBlocks large.
if (numBlocks % patternLengthInBlocks >= pattern.encryptBlocks)
increment += pattern.encryptBlocks;
} }
incrementIV(increment, &ivVector); incrementIV(increment, &ivVector);
@@ -429,26 +431,6 @@ Status_V1_2 WVCryptoPlugin::attemptDecrypt(const CdmDecryptionParameters& params
} }
} }
CdmResponseType WVCryptoPlugin::countEncryptedBlocksInPatternedRange(
size_t range, const Pattern& pattern, uint64_t* result) {
if (result == NULL || range % kAESBlockSize != 0) {
return wvcdm::UNKNOWN_ERROR;
}
const size_t patternLength = pattern.encryptBlocks + pattern.skipBlocks;
uint64_t encryptedBlocksPassed = 0;
size_t patternPosition = 0;
for (size_t remaining = range / kAESBlockSize; remaining > 0; --remaining) {
if (patternPosition < pattern.encryptBlocks) {
++encryptedBlocksPassed;
}
patternPosition = (patternPosition + 1) % patternLength;
}
*result = encryptedBlocksPassed;
return wvcdm::NO_ERROR;
}
void WVCryptoPlugin::incrementIV(uint64_t increaseBy, void WVCryptoPlugin::incrementIV(uint64_t increaseBy,
std::vector<uint8_t>* ivPtr) { std::vector<uint8_t>* ivPtr) {
std::vector<uint8_t>& iv = *ivPtr; std::vector<uint8_t>& iv = *ivPtr;