summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-05-16 18:32:43 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-16 18:32:43 +0000
commitdebd2d23306313712a60a7c380ece864f7a3a9ab (patch)
treee2d67fbe173879bd59d1565461909cd774771caa /core
parentc8f4e72cc26bd749bba8ad0d44d2c2bf838714b0 (diff)
downloadpdfium-debd2d23306313712a60a7c380ece864f7a3a9ab.tar.xz
Use pdfium::span<> in cpdf_crypto_handler.h
Remove some unused args along the way. Change-Id: I234a674d4d6cc79b33087bc850f5df36bae25870 Reviewed-on: https://pdfium-review.googlesource.com/32596 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/edit/cpdf_encryptor.cpp2
-rw-r--r--core/fpdfapi/parser/cpdf_crypto_handler.cpp67
-rw-r--r--core/fpdfapi/parser/cpdf_crypto_handler.h13
3 files changed, 37 insertions, 45 deletions
diff --git a/core/fpdfapi/edit/cpdf_encryptor.cpp b/core/fpdfapi/edit/cpdf_encryptor.cpp
index 61976186d2..8994b555ee 100644
--- a/core/fpdfapi/edit/cpdf_encryptor.cpp
+++ b/core/fpdfapi/edit/cpdf_encryptor.cpp
@@ -18,7 +18,7 @@ CPDF_Encryptor::CPDF_Encryptor(CPDF_CryptoHandler* pHandler,
return;
}
- uint32_t buf_size = pHandler->EncryptGetSize(objnum, 0, src_data);
+ uint32_t buf_size = pHandler->EncryptGetSize(src_data);
m_NewBuf.resize(buf_size);
pHandler->EncryptContent(objnum, 0, src_data, m_NewBuf.data(),
buf_size); // Updates |buf_size| with actual.
diff --git a/core/fpdfapi/parser/cpdf_crypto_handler.cpp b/core/fpdfapi/parser/cpdf_crypto_handler.cpp
index f0bf1139fd..30d5dc03ff 100644
--- a/core/fpdfapi/parser/cpdf_crypto_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_crypto_handler.cpp
@@ -48,12 +48,11 @@ bool CPDF_CryptoHandler::IsSignatureDictionary(
void CPDF_CryptoHandler::CryptBlock(bool bEncrypt,
uint32_t objnum,
uint32_t gennum,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
uint8_t* dest_buf,
uint32_t& dest_size) {
if (m_Cipher == FXCIPHER_NONE) {
- memcpy(dest_buf, src_buf, src_size);
+ memcpy(dest_buf, source.data(), source.size());
return;
}
uint8_t realkey[16];
@@ -83,26 +82,27 @@ void CPDF_CryptoHandler::CryptBlock(bool bEncrypt,
}
CRYPT_AESSetIV(m_pAESContext.get(), iv);
memcpy(dest_buf, iv, 16);
- int nblocks = src_size / 16;
- CRYPT_AESEncrypt(m_pAESContext.get(), dest_buf + 16, src_buf,
+ int nblocks = source.size() / 16;
+ CRYPT_AESEncrypt(m_pAESContext.get(), dest_buf + 16, source.data(),
nblocks * 16);
uint8_t padding[16];
- memcpy(padding, src_buf + nblocks * 16, src_size % 16);
- memset(padding + src_size % 16, 16 - src_size % 16, 16 - src_size % 16);
+ memcpy(padding, source.data() + nblocks * 16, source.size() % 16);
+ memset(padding + source.size() % 16, 16 - source.size() % 16,
+ 16 - source.size() % 16);
CRYPT_AESEncrypt(m_pAESContext.get(), dest_buf + nblocks * 16 + 16,
padding, 16);
dest_size = 32 + nblocks * 16;
} else {
- CRYPT_AESSetIV(m_pAESContext.get(), src_buf);
- CRYPT_AESDecrypt(m_pAESContext.get(), dest_buf, src_buf + 16,
- src_size - 16);
- dest_size = src_size - 16;
+ CRYPT_AESSetIV(m_pAESContext.get(), source.data());
+ CRYPT_AESDecrypt(m_pAESContext.get(), dest_buf, source.data() + 16,
+ source.size() - 16);
+ dest_size = source.size() - 16;
dest_size -= dest_buf[dest_size - 1];
}
} else {
- ASSERT(dest_size == src_size);
- if (dest_buf != src_buf) {
- memcpy(dest_buf, src_buf, src_size);
+ ASSERT(dest_size == source.size());
+ if (dest_buf != source.data()) {
+ memcpy(dest_buf, source.data(), source.size());
}
CRYPT_ArcFourCryptBlock(dest_buf, dest_size, realkey, realkeylen);
}
@@ -166,22 +166,21 @@ void* CPDF_CryptoHandler::CryptStart(uint32_t objnum,
}
bool CPDF_CryptoHandler::CryptStream(void* context,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
CFX_BinaryBuf& dest_buf,
bool bEncrypt) {
- if (!context) {
+ if (!context)
return false;
- }
+
if (m_Cipher == FXCIPHER_NONE) {
- dest_buf.AppendBlock(src_buf, src_size);
+ dest_buf.AppendBlock(source.data(), source.size());
return true;
}
if (m_Cipher == FXCIPHER_RC4) {
int old_size = dest_buf.GetSize();
- dest_buf.AppendBlock(src_buf, src_size);
+ dest_buf.AppendBlock(source.data(), source.size());
CRYPT_ArcFourCrypt(static_cast<CRYPT_rc4_context*>(context),
- dest_buf.GetBuffer() + old_size, src_size);
+ dest_buf.GetBuffer() + old_size, source.size());
return true;
}
AESCryptContext* pContext = static_cast<AESCryptContext*>(context);
@@ -190,13 +189,13 @@ bool CPDF_CryptoHandler::CryptStream(void* context,
pContext->m_bIV = false;
}
uint32_t src_off = 0;
- uint32_t src_left = src_size;
+ uint32_t src_left = source.size();
while (1) {
uint32_t copy_size = 16 - pContext->m_BlockOffset;
if (copy_size > src_left) {
copy_size = src_left;
}
- memcpy(pContext->m_Block + pContext->m_BlockOffset, src_buf + src_off,
+ memcpy(pContext->m_Block + pContext->m_BlockOffset, source.data() + src_off,
copy_size);
src_off += copy_size;
src_left -= copy_size;
@@ -206,7 +205,7 @@ bool CPDF_CryptoHandler::CryptStream(void* context,
CRYPT_AESSetIV(&pContext->m_Context, pContext->m_Block);
pContext->m_bIV = false;
pContext->m_BlockOffset = 0;
- } else if (src_off < src_size) {
+ } else if (src_off < source.size()) {
uint8_t block_buf[16];
if (bEncrypt) {
CRYPT_AESEncrypt(&pContext->m_Context, block_buf, pContext->m_Block,
@@ -267,7 +266,7 @@ ByteString CPDF_CryptoHandler::Decrypt(uint32_t objnum,
const ByteString& str) {
CFX_BinaryBuf dest_buf;
void* context = DecryptStart(objnum, gennum);
- DecryptStream(context, str.raw_str(), str.GetLength(), dest_buf);
+ DecryptStream(context, str.AsRawSpan(), dest_buf);
DecryptFinish(context, dest_buf);
return ByteString(dest_buf.GetBuffer(), dest_buf.GetSize());
}
@@ -339,8 +338,10 @@ std::unique_ptr<CPDF_Object> CPDF_CryptoHandler::DecryptObjectTree(
void* context = DecryptStart(obj_num, gen_num);
bool decrypt_result =
- DecryptStream(context, stream_access->GetData(),
- stream_access->GetSize(), decrypted_buf);
+ DecryptStream(context,
+ pdfium::make_span(stream_access->GetData(),
+ stream_access->GetSize()),
+ decrypted_buf);
decrypt_result &= DecryptFinish(context, decrypted_buf);
if (decrypt_result) {
const uint32_t decrypted_size = decrypted_buf.GetSize();
@@ -366,19 +367,16 @@ std::unique_ptr<CPDF_Object> CPDF_CryptoHandler::DecryptObjectTree(
}
bool CPDF_CryptoHandler::DecryptStream(void* context,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
CFX_BinaryBuf& dest_buf) {
- return CryptStream(context, src_buf, src_size, dest_buf, false);
+ return CryptStream(context, source, dest_buf, false);
}
bool CPDF_CryptoHandler::DecryptFinish(void* context, CFX_BinaryBuf& dest_buf) {
return CryptFinish(context, dest_buf, false);
}
-uint32_t CPDF_CryptoHandler::EncryptGetSize(
- uint32_t objnum,
- uint32_t version,
+size_t CPDF_CryptoHandler::EncryptGetSize(
pdfium::span<const uint8_t> source) const {
return m_Cipher == FXCIPHER_AES ? source.size() + 32 : source.size();
}
@@ -388,8 +386,7 @@ bool CPDF_CryptoHandler::EncryptContent(uint32_t objnum,
pdfium::span<const uint8_t> source,
uint8_t* dest_buf,
uint32_t& dest_size) {
- CryptBlock(true, objnum, gennum, source.data(), source.size(), dest_buf,
- dest_size);
+ CryptBlock(true, objnum, gennum, source, dest_buf, dest_size);
return true;
}
diff --git a/core/fpdfapi/parser/cpdf_crypto_handler.h b/core/fpdfapi/parser/cpdf_crypto_handler.h
index 23dfe4aae1..3f65f6ea63 100644
--- a/core/fpdfapi/parser/cpdf_crypto_handler.h
+++ b/core/fpdfapi/parser/cpdf_crypto_handler.h
@@ -31,9 +31,7 @@ class CPDF_CryptoHandler {
std::unique_ptr<CPDF_Object> DecryptObjectTree(
std::unique_ptr<CPDF_Object> object);
- uint32_t EncryptGetSize(uint32_t objnum,
- uint32_t version,
- pdfium::span<const uint8_t> source) const;
+ size_t EncryptGetSize(pdfium::span<const uint8_t> source) const;
bool EncryptContent(uint32_t objnum,
uint32_t version,
pdfium::span<const uint8_t> source,
@@ -47,8 +45,7 @@ class CPDF_CryptoHandler {
void* DecryptStart(uint32_t objnum, uint32_t gennum);
ByteString Decrypt(uint32_t objnum, uint32_t gennum, const ByteString& str);
bool DecryptStream(void* context,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
CFX_BinaryBuf& dest_buf);
bool DecryptFinish(void* context, CFX_BinaryBuf& dest_buf);
@@ -56,14 +53,12 @@ class CPDF_CryptoHandler {
void CryptBlock(bool bEncrypt,
uint32_t objnum,
uint32_t gennum,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
uint8_t* dest_buf,
uint32_t& dest_size);
void* CryptStart(uint32_t objnum, uint32_t gennum, bool bEncrypt);
bool CryptStream(void* context,
- const uint8_t* src_buf,
- uint32_t src_size,
+ pdfium::span<const uint8_t> source,
CFX_BinaryBuf& dest_buf,
bool bEncrypt);
bool CryptFinish(void* context, CFX_BinaryBuf& dest_buf, bool bEncrypt);