summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorArtem Strygin <art-snake@yandex-team.ru>2017-10-03 18:16:25 +0300
committerChromium commit bot <commit-bot@chromium.org>2017-10-03 16:22:16 +0000
commite4289f69a28d26d14c94bcc0c0b8368dbc2f7e1c (patch)
treef7727344c28d4046ab14066758bccb905708f8bb /core/fpdfapi
parent6caef3028fd5ce9751fb246b084ad0e139aa9c77 (diff)
downloadpdfium-e4289f69a28d26d14c94bcc0c0b8368dbc2f7e1c.tar.xz
Remove the parser from the CPDF_SecurityHandler .
Change-Id: I9fb651285c158e0f61d19e1aaf0d8bcfd302a22f Reviewed-on: https://pdfium-review.googlesource.com/15290 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/parser/cpdf_parser.cpp3
-rw-r--r--core/fpdfapi/parser/cpdf_security_handler.cpp26
-rw-r--r--core/fpdfapi/parser/cpdf_security_handler.h7
3 files changed, 19 insertions, 17 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 1965146728..17f49c6324 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -311,7 +311,8 @@ CPDF_Parser::Error CPDF_Parser::SetEncryptHandler() {
std::unique_ptr<CPDF_SecurityHandler> pSecurityHandler =
pdfium::MakeUnique<CPDF_SecurityHandler>();
- if (!pSecurityHandler->OnInit(this, m_pEncryptDict.Get()))
+ if (!pSecurityHandler->OnInit(m_pEncryptDict.Get(), GetIDArray(),
+ m_Password))
return PASSWORD_ERROR;
m_pSecurityHandler = std::move(pSecurityHandler);
diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp
index b838e9cf05..dce2ac4fdc 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler.cpp
@@ -17,7 +17,6 @@
#include "core/fpdfapi/parser/cpdf_crypto_handler.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_object.h"
-#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfapi/parser/cpdf_string.h"
namespace {
@@ -33,7 +32,7 @@ void CalcEncryptKey(CPDF_Dictionary* pEncrypt,
uint8_t* key,
int keylen,
bool bIgnoreMeta,
- CPDF_Array* pIdArray) {
+ const CPDF_Array* pIdArray) {
int revision = pEncrypt->GetIntegerFor("R");
uint8_t passcode[32];
for (uint32_t i = 0; i < 32; i++) {
@@ -75,7 +74,6 @@ void CalcEncryptKey(CPDF_Dictionary* pEncrypt,
CPDF_SecurityHandler::CPDF_SecurityHandler()
: m_Version(0),
m_Revision(0),
- m_pParser(nullptr),
m_pEncryptDict(nullptr),
m_Permissions(0),
m_Cipher(FXCIPHER_NONE),
@@ -84,9 +82,11 @@ CPDF_SecurityHandler::CPDF_SecurityHandler()
CPDF_SecurityHandler::~CPDF_SecurityHandler() {}
-bool CPDF_SecurityHandler::OnInit(CPDF_Parser* pParser,
- CPDF_Dictionary* pEncryptDict) {
- m_pParser = pParser;
+bool CPDF_SecurityHandler::OnInit(CPDF_Dictionary* pEncryptDict,
+ const CPDF_Array* pIdArray,
+ const ByteString& password) {
+ m_pIdArray = pIdArray;
+ m_Password = password;
if (!LoadDict(pEncryptDict)) {
return false;
}
@@ -97,14 +97,13 @@ bool CPDF_SecurityHandler::OnInit(CPDF_Parser* pParser,
}
bool CPDF_SecurityHandler::CheckSecurity(int32_t key_len) {
- ByteString password = m_pParser->GetPassword();
- if (!password.IsEmpty() &&
- CheckPassword(password.raw_str(), password.GetLength(), true,
+ if (!m_Password.IsEmpty() &&
+ CheckPassword(m_Password.raw_str(), m_Password.GetLength(), true,
m_EncryptKey, key_len)) {
m_bOwnerUnlocked = true;
return true;
}
- return CheckPassword(password.raw_str(), password.GetLength(), false,
+ return CheckPassword(m_Password.raw_str(), m_Password.GetLength(), false,
m_EncryptKey, key_len);
}
@@ -414,7 +413,7 @@ bool CPDF_SecurityHandler::CheckUserPassword(const uint8_t* password,
uint8_t* key,
int32_t key_len) {
CalcEncryptKey(m_pEncryptDict.Get(), password, pass_size, key, key_len,
- bIgnoreEncryptMeta, m_pParser->GetIDArray());
+ bIgnoreEncryptMeta, m_pIdArray.Get());
ByteString ukey =
m_pEncryptDict ? m_pEncryptDict->GetStringFor("U") : ByteString();
if (ukey.GetLength() < 16) {
@@ -441,9 +440,8 @@ bool CPDF_SecurityHandler::CheckUserPassword(const uint8_t* password,
CRYPT_md5_context md5;
CRYPT_MD5Start(&md5);
CRYPT_MD5Update(&md5, defpasscode, 32);
- CPDF_Array* pIdArray = m_pParser->GetIDArray();
- if (pIdArray) {
- ByteString id = pIdArray->GetStringAt(0);
+ if (m_pIdArray) {
+ ByteString id = m_pIdArray->GetStringAt(0);
CRYPT_MD5Update(&md5, (uint8_t*)id.c_str(), id.GetLength());
}
CRYPT_MD5Finish(&md5, ukeybuf);
diff --git a/core/fpdfapi/parser/cpdf_security_handler.h b/core/fpdfapi/parser/cpdf_security_handler.h
index 656aba0058..8b55fa21a7 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.h
+++ b/core/fpdfapi/parser/cpdf_security_handler.h
@@ -27,7 +27,9 @@ class CPDF_SecurityHandler {
CPDF_SecurityHandler();
~CPDF_SecurityHandler();
- bool OnInit(CPDF_Parser* pParser, CPDF_Dictionary* pEncryptDict);
+ bool OnInit(CPDF_Dictionary* pEncryptDict,
+ const CPDF_Array* pIdArray,
+ const ByteString& password);
uint32_t GetPermissions();
bool GetCryptInfo(int& cipher, const uint8_t*& buffer, int& keylen);
bool IsMetadataEncrypted() const;
@@ -97,8 +99,9 @@ class CPDF_SecurityHandler {
int m_Version;
int m_Revision;
- UnownedPtr<CPDF_Parser> m_pParser;
UnownedPtr<CPDF_Dictionary> m_pEncryptDict;
+ UnownedPtr<const CPDF_Array> m_pIdArray;
+ ByteString m_Password;
uint32_t m_Permissions;
int m_Cipher;
uint8_t m_EncryptKey[32];