summaryrefslogtreecommitdiff
path: root/core/fdrm/crypto
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-29 10:00:05 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-29 10:00:05 -0700
commitb1469a2c89d338c7fc3e9029405c8bc7e1018b84 (patch)
treeca818551335f3ea431762cbb1fe2f50eca89b3d9 /core/fdrm/crypto
parentf7a0d695b7e4f7b0dede23605ef449145aaa6d5a (diff)
downloadpdfium-b1469a2c89d338c7fc3e9029405c8bc7e1018b84.tar.xz
Move core/fdrm/crypto/include to core/fdrm/crypto
BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2374413002
Diffstat (limited to 'core/fdrm/crypto')
-rw-r--r--core/fdrm/crypto/fx_crypt.cpp2
-rw-r--r--core/fdrm/crypto/fx_crypt.h (renamed from core/fdrm/crypto/include/fx_crypt.h)6
-rw-r--r--core/fdrm/crypto/fx_crypt_aes.cpp2
-rw-r--r--core/fdrm/crypto/fx_crypt_sha.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/core/fdrm/crypto/fx_crypt.cpp b/core/fdrm/crypto/fx_crypt.cpp
index ed7ede0b5a..885b468839 100644
--- a/core/fdrm/crypto/fx_crypt.cpp
+++ b/core/fdrm/crypto/fx_crypt.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fdrm/crypto/include/fx_crypt.h b/core/fdrm/crypto/fx_crypt.h
index 155def6f88..bb9f4a9730 100644
--- a/core/fdrm/crypto/include/fx_crypt.h
+++ b/core/fdrm/crypto/fx_crypt.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
-#define CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
+#ifndef CORE_FDRM_CRYPTO_FX_CRYPT_H_
+#define CORE_FDRM_CRYPTO_FX_CRYPT_H_
#include "core/fxcrt/include/fx_system.h"
@@ -68,4 +68,4 @@ void CRYPT_SetPubKeyDecryptor(FX_BOOL (*func)(const uint8_t* pData,
};
#endif
-#endif // CORE_FDRM_CRYPTO_INCLUDE_FX_CRYPT_H_
+#endif // CORE_FDRM_CRYPTO_FX_CRYPT_H_
diff --git a/core/fdrm/crypto/fx_crypt_aes.cpp b/core/fdrm/crypto/fx_crypt_aes.cpp
index 1a6eab4283..27c064e19f 100644
--- a/core/fdrm/crypto/fx_crypt_aes.cpp
+++ b/core/fdrm/crypto/fx_crypt_aes.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {
diff --git a/core/fdrm/crypto/fx_crypt_sha.cpp b/core/fdrm/crypto/fx_crypt_sha.cpp
index 222ab9eb80..eb3373cfb0 100644
--- a/core/fdrm/crypto/fx_crypt_sha.cpp
+++ b/core/fdrm/crypto/fx_crypt_sha.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fdrm/crypto/include/fx_crypt.h"
+#include "core/fdrm/crypto/fx_crypt.h"
#ifdef __cplusplus
extern "C" {