diff options
author | Artem Strygin <art-snake@yandex-team.ru> | 2017-10-03 21:51:18 +0300 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-03 19:01:05 +0000 |
commit | a081931e2b00e3aadff2050f7d253e17c124c69f (patch) | |
tree | 1ec6c2f5ba7e7a7d875cffe658e56dbc0803c122 /core/fpdfapi/parser/cpdf_security_handler.h | |
parent | c3d5c9746384ccf13617370fbc81397040355c4d (diff) | |
download | pdfium-a081931e2b00e3aadff2050f7d253e17c124c69f.tar.xz |
Move initialization of CPDF_CryptoHandler into CPDF_SytnaxParser initialization.
Change-Id: I70d04f38767f2c17c41407fc9b4fc25519ba32f4
Reviewed-on: https://pdfium-review.googlesource.com/15330
Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_security_handler.h')
-rw-r--r-- | core/fpdfapi/parser/cpdf_security_handler.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfapi/parser/cpdf_security_handler.h b/core/fpdfapi/parser/cpdf_security_handler.h index 753a8503a1..c92dc46862 100644 --- a/core/fpdfapi/parser/cpdf_security_handler.h +++ b/core/fpdfapi/parser/cpdf_security_handler.h @@ -33,7 +33,6 @@ class CPDF_SecurityHandler { const CPDF_Array* pIdArray, const ByteString& password); uint32_t GetPermissions(); - bool GetCryptInfo(int& cipher, const uint8_t*& buffer, int& keylen); bool IsMetadataEncrypted() const; void OnCreate(CPDF_Dictionary* pEncryptDict, @@ -53,7 +52,6 @@ class CPDF_SecurityHandler { uint8_t* key, int key_len); - bool InitCryptoHandler(); CPDF_CryptoHandler* GetCryptoHandler() const { return m_pCryptoHandler.get(); } @@ -84,14 +82,16 @@ class CPDF_SecurityHandler { uint32_t permission, bool bEncryptMetadata, const uint8_t* key); - void OnCreate(CPDF_Dictionary* pEncryptDict, - CPDF_Array* pIdArray, - const ByteString& user_password, - const ByteString& owner_password, - bool bDefault, - uint32_t type); + void OnCreateInternal(CPDF_Dictionary* pEncryptDict, + CPDF_Array* pIdArray, + const ByteString& user_password, + const ByteString& owner_password, + bool bDefault, + uint32_t type); bool CheckSecurity(const ByteString& password); + void InitCryptoHandler(); + int m_Version; int m_Revision; UnownedPtr<CPDF_Dictionary> m_pEncryptDict; |