From a081931e2b00e3aadff2050f7d253e17c124c69f Mon Sep 17 00:00:00 2001 From: Artem Strygin Date: Tue, 3 Oct 2017 21:51:18 +0300 Subject: Move initialization of CPDF_CryptoHandler into CPDF_SytnaxParser initialization. Change-Id: I70d04f38767f2c17c41407fc9b4fc25519ba32f4 Reviewed-on: https://pdfium-review.googlesource.com/15330 Commit-Queue: Art Snake Reviewed-by: dsinclair --- core/fpdfapi/parser/cpdf_security_handler.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_security_handler.h') 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 m_pEncryptDict; -- cgit v1.2.3