diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-16 17:07:02 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-16 17:07:02 +0000 |
| commit | 6facd15a7ecfbae24f2c356fa3b358288120a6f2 (patch) | |
| tree | 414690887496c657e1147fd6e1342dd1bee7ba53 /core/fpdfapi/parser | |
| parent | fc0bbda00d476ba0c0b43dd88fd1d1a1d11577cc (diff) | |
| download | pdfium-6facd15a7ecfbae24f2c356fa3b358288120a6f2.tar.xz | |
Use pdfium::span<> in cpdf_creator.
Change-Id: I959fe5dc30fcfe2176c7e5a64b07d082313a22b4
Reviewed-on: https://pdfium-review.googlesource.com/32595
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_crypto_handler.cpp | 20 | ||||
| -rw-r--r-- | core/fpdfapi/parser/cpdf_crypto_handler.h | 7 |
2 files changed, 12 insertions, 15 deletions
diff --git a/core/fpdfapi/parser/cpdf_crypto_handler.cpp b/core/fpdfapi/parser/cpdf_crypto_handler.cpp index fa784668fa..f0bf1139fd 100644 --- a/core/fpdfapi/parser/cpdf_crypto_handler.cpp +++ b/core/fpdfapi/parser/cpdf_crypto_handler.cpp @@ -375,23 +375,21 @@ bool CPDF_CryptoHandler::DecryptStream(void* context, 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, - const uint8_t* src_buf, - uint32_t src_size) { - if (m_Cipher == FXCIPHER_AES) { - return src_size + 32; - } - return src_size; + +uint32_t CPDF_CryptoHandler::EncryptGetSize( + uint32_t objnum, + uint32_t version, + pdfium::span<const uint8_t> source) const { + return m_Cipher == FXCIPHER_AES ? source.size() + 32 : source.size(); } bool CPDF_CryptoHandler::EncryptContent(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) { - CryptBlock(true, objnum, gennum, src_buf, src_size, dest_buf, dest_size); + CryptBlock(true, objnum, gennum, source.data(), source.size(), 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 1ca2130717..23dfe4aae1 100644 --- a/core/fpdfapi/parser/cpdf_crypto_handler.h +++ b/core/fpdfapi/parser/cpdf_crypto_handler.h @@ -15,6 +15,7 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "third_party/base/span.h" class CPDF_Dictionary; class CPDF_Object; @@ -32,12 +33,10 @@ class CPDF_CryptoHandler { uint32_t EncryptGetSize(uint32_t objnum, uint32_t version, - const uint8_t* src_buf, - uint32_t src_size); + pdfium::span<const uint8_t> source) const; bool EncryptContent(uint32_t objnum, uint32_t version, - const uint8_t* src_buf, - uint32_t src_size, + pdfium::span<const uint8_t> source, uint8_t* dest_buf, uint32_t& dest_size); |