Proposed fix for shaka-project#1316

synologic · Dec 13, 2023 · 92c2b42 · 92c2b42
1 parent 3e71302
commit 92c2b42
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packager/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc
@@ -141,7 +141,8 @@ bool AesCbcEncryptor::CryptInternal(const uint8_t* plaintext,
   const size_t num_padding_bytes = NumPaddingBytes(plaintext_size);
   const size_t required_ciphertext_size = RequiredOutputSize(plaintext_size);
 
-  if (*ciphertext_size < required_ciphertext_size) {
+  // RequiredOutputSize returns the plaintext_size plus AES_BLOCK_SIZE as required by mbedtls, subtract that here
+  if (*ciphertext_size < required_ciphertext_size - AES_BLOCK_SIZE) {
     LOG(ERROR) << "Expecting output size of at least "
                << required_ciphertext_size << " bytes.";
     return false;