summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_parser
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-23 10:11:11 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-23 10:11:11 -0800
commitd21cddaa7548584bfcebefe9a03e857fee3a846b (patch)
tree0211132f874bfc0ba36b339b4fe961331f88f036 /core/src/fpdfapi/fpdf_parser
parent2eaa2ef03f7fc9417007d554ee955137fe9ff7b4 (diff)
downloadpdfium-d21cddaa7548584bfcebefe9a03e857fee3a846b.tar.xz
Remove many _CAPS structure names.
They're technically not allowed because they are reserved for the preprocessor. Also get rid of LPC* typedefs along the way. Also provide a header for a data file containing many instance of these found along the way. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1722873002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
index 61becaee6a..799e748761 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp
@@ -60,12 +60,12 @@ CPDF_CryptoHandler* CPDF_StandardSecurityHandler::CreateCryptoHandler() {
return new CPDF_StandardCryptoHandler;
}
-typedef struct _PDF_CRYPTOITEM {
+struct PDF_CRYPTOITEM {
int32_t m_Cipher;
int32_t m_KeyLen;
FX_BOOL m_bChecked;
CPDF_StandardCryptoHandler* m_pCryptoHandler;
-} PDF_CRYPTOITEM;
+};
CPDF_StandardSecurityHandler::CPDF_StandardSecurityHandler() {
m_Version = 0;
@@ -775,12 +775,14 @@ void CPDF_StandardCryptoHandler::CryptBlock(FX_BOOL bEncrypt,
CRYPT_ArcFourCryptBlock(dest_buf, dest_size, realkey, realkeylen);
}
}
-typedef struct _AESCryptContext {
+
+struct AESCryptContext {
uint8_t m_Context[2048];
FX_BOOL m_bIV;
uint8_t m_Block[16];
FX_DWORD m_BlockOffset;
-} AESCryptContext;
+};
+
void* CPDF_StandardCryptoHandler::CryptStart(FX_DWORD objnum,
FX_DWORD gennum,
FX_BOOL bEncrypt) {