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

Don't Increment IV for Partial Blocks in Unit Tests am: 3f040e0a9d am: 4b380dfb1b

Browse Source 
am: dfd6df5cf9

Change-Id: I2fa15c7971020a7e9c0beed5400450d0206e412a
This commit is contained in:
Fred Gylys-Colwell
2016-09-07 18:48:00 +00:00
committed by android-build-merger
parent c764294a3b dfd6df5cf9
commit ed3d0807bc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -2492,6 +2492,7 @@ class OEMCryptoSessionTestsDecryptTests
(size < AES_BLOCK_SIZE))) { (size < AES_BLOCK_SIZE))) {
memcpy(&(*out_buffer)[buffer_index], &in_buffer[buffer_index], memcpy(&(*out_buffer)[buffer_index], &in_buffer[buffer_index],
size); size);
block_offset = 0; // Next block should be complete.
} else { } else {
if (cipher_mode_ == OEMCrypto_CipherMode_CTR) { if (cipher_mode_ == OEMCrypto_CipherMode_CTR) {
uint8_t aes_output[AES_BLOCK_SIZE]; uint8_t aes_output[AES_BLOCK_SIZE];
@@ -2501,7 +2502,15 @@ class OEMCryptoSessionTestsDecryptTests
aes_output[n + block_offset] ^ aes_output[n + block_offset] ^
in_buffer[buffer_index + n]; in_buffer[buffer_index + n];
} }
ctr128_inc64(1, iv); if (size + block_offset < AES_BLOCK_SIZE) {
// Partial block. Don't increment iv. Compute next block offset.
block_offset = block_offset + size;
} else {
EXPECT_EQ(AES_BLOCK_SIZE, block_offset + size);
// Full block. Increment iv, and set offset to 0 for next block.
ctr128_inc64(1, iv);
block_offset = 0;
}
} else { } else {
uint8_t aes_input[AES_BLOCK_SIZE]; uint8_t aes_input[AES_BLOCK_SIZE];
for (size_t n = 0; n < size; n++) { for (size_t n = 0; n < size; n++) {
@@ -2509,13 +2518,12 @@ class OEMCryptoSessionTestsDecryptTests
} }
AES_encrypt(aes_input, &(*out_buffer)[buffer_index], &aes_key); AES_encrypt(aes_input, &(*out_buffer)[buffer_index], &aes_key);
memcpy(iv, &(*out_buffer)[buffer_index], AES_BLOCK_SIZE); memcpy(iv, &(*out_buffer)[buffer_index], AES_BLOCK_SIZE);
// CBC mode should always start on block boundary.
block_offset = 0;
} }
} }
buffer_index += size; buffer_index += size;
block_offset = 0;
} }
block_offset =
(block_offset + subsample_size_[i].encrypted_size) % AES_BLOCK_SIZE;
} }
} }