diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-12 18:54:31 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-12 18:54:31 +0000 |
| commit | d145e4b923ae99f67b734924885738437248aa85 (patch) | |
| tree | 523c8bd30a4385c7f13fcf6ddffcb25ab5057255 /core/fdrm | |
| parent | 76833a60164e77bd54c6f4d1cc62a79ded8edb90 (diff) | |
| download | pdfium-d145e4b923ae99f67b734924885738437248aa85.tar.xz | |
Move core/fdrm/crypto/* to core/fdrm/.
core/fdrm/ currently only contains the crypto directory.
Change-Id: I68f4a38e7098f8a3bdc19764bc1ec78c28a386c9
Reviewed-on: https://pdfium-review.googlesource.com/c/43945
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fdrm')
| -rw-r--r-- | core/fdrm/fx_crypt.cpp (renamed from core/fdrm/crypto/fx_crypt.cpp) | 2 | ||||
| -rw-r--r-- | core/fdrm/fx_crypt.h (renamed from core/fdrm/crypto/fx_crypt.h) | 6 | ||||
| -rw-r--r-- | core/fdrm/fx_crypt_aes.cpp (renamed from core/fdrm/crypto/fx_crypt_aes.cpp) | 6 | ||||
| -rw-r--r-- | core/fdrm/fx_crypt_sha.cpp (renamed from core/fdrm/crypto/fx_crypt_sha.cpp) | 2 | ||||
| -rw-r--r-- | core/fdrm/fx_crypt_unittest.cpp (renamed from core/fdrm/crypto/fx_crypt_unittest.cpp) | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/core/fdrm/crypto/fx_crypt.cpp b/core/fdrm/fx_crypt.cpp index d53fa6ba7a..e31bde992c 100644 --- a/core/fdrm/crypto/fx_crypt.cpp +++ b/core/fdrm/fx_crypt.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fdrm/crypto/fx_crypt.h" +#include "core/fdrm/fx_crypt.h" #include <utility> diff --git a/core/fdrm/crypto/fx_crypt.h b/core/fdrm/fx_crypt.h index 0c7484c256..4e8a7132a8 100644 --- a/core/fdrm/crypto/fx_crypt.h +++ b/core/fdrm/fx_crypt.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FDRM_CRYPTO_FX_CRYPT_H_ -#define CORE_FDRM_CRYPTO_FX_CRYPT_H_ +#ifndef CORE_FDRM_FX_CRYPT_H_ +#define CORE_FDRM_FX_CRYPT_H_ #include "core/fxcrt/fx_system.h" @@ -114,4 +114,4 @@ void CRYPT_SHA512Generate(const uint8_t* data, uint32_t size, uint8_t digest[64]); -#endif // CORE_FDRM_CRYPTO_FX_CRYPT_H_ +#endif // CORE_FDRM_FX_CRYPT_H_ diff --git a/core/fdrm/crypto/fx_crypt_aes.cpp b/core/fdrm/fx_crypt_aes.cpp index 467cc97213..3397574fac 100644 --- a/core/fdrm/crypto/fx_crypt_aes.cpp +++ b/core/fdrm/fx_crypt_aes.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fdrm/crypto/fx_crypt.h" +#include "core/fdrm/fx_crypt.h" #define mulby2(x) (((x & 0x7F) << 1) ^ (x & 0x80 ? 0x1B : 0)) #define GET_32BIT_MSB_FIRST(cp) \ @@ -515,9 +515,7 @@ void aes_decrypt_nb_4(CRYPT_aes_context* ctx, unsigned int* block) { #undef MAKEWORD #undef LASTWORD -void aes_setup(CRYPT_aes_context* ctx, - const unsigned char* key, - int keylen) { +void aes_setup(CRYPT_aes_context* ctx, const unsigned char* key, int keylen) { ASSERT(keylen == 16 || keylen == 24 || keylen == 32); int Nk = keylen / 4; ctx->Nb = 4; diff --git a/core/fdrm/crypto/fx_crypt_sha.cpp b/core/fdrm/fx_crypt_sha.cpp index 31742e79c6..573edb8042 100644 --- a/core/fdrm/crypto/fx_crypt_sha.cpp +++ b/core/fdrm/fx_crypt_sha.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fdrm/crypto/fx_crypt.h" +#include "core/fdrm/fx_crypt.h" #define rol(x, y) (((x) << (y)) | (((unsigned int)x) >> (32 - y))) diff --git a/core/fdrm/crypto/fx_crypt_unittest.cpp b/core/fdrm/fx_crypt_unittest.cpp index e7f05b2939..b6389d1e5e 100644 --- a/core/fdrm/crypto/fx_crypt_unittest.cpp +++ b/core/fdrm/fx_crypt_unittest.cpp @@ -4,7 +4,7 @@ // Originally from chromium's /src/base/md5_unittest.cc. -#include "core/fdrm/crypto/fx_crypt.h" +#include "core/fdrm/fx_crypt.h" #include <memory> #include <string> |