diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
commit | 6581175666ba4e1eb2826142376cbfe4495c6e76 (patch) | |
tree | 38770d7cf709979b0d493a6ca0367a0cbc080736 /core/src/fdrm/crypto/fx_crypt_aes.cpp | |
parent | 05f11bcf48a630b53cac603538bb75f21ad4231d (diff) | |
download | pdfium-6581175666ba4e1eb2826142376cbfe4495c6e76.tar.xz |
Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}.
Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
follwed by scripts.
Original Review URL: https://codereview.chromium.org/1179693003.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1179953002.
Diffstat (limited to 'core/src/fdrm/crypto/fx_crypt_aes.cpp')
-rw-r--r-- | core/src/fdrm/crypto/fx_crypt_aes.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fdrm/crypto/fx_crypt_aes.cpp b/core/src/fdrm/crypto/fx_crypt_aes.cpp index 4de0f7e752..107bfeace0 100644 --- a/core/src/fdrm/crypto/fx_crypt_aes.cpp +++ b/core/src/fdrm/crypto/fx_crypt_aes.cpp @@ -949,7 +949,7 @@ static void aes_decrypt_cbc(unsigned char *dest, const unsigned char *src, int l unsigned int iv[4], x[4], ct[4]; int i; ASSERT((len & 15) == 0); - FXSYS_memcpy32(iv, ctx->iv, sizeof(iv)); + FXSYS_memcpy(iv, ctx->iv, sizeof(iv)); while (len > 0) { for (i = 0; i < 4; i++) { x[i] = ct[i] = GET_32BIT_MSB_FIRST(src + 4 * i); @@ -963,7 +963,7 @@ static void aes_decrypt_cbc(unsigned char *dest, const unsigned char *src, int l src += 16; len -= 16; } - FXSYS_memcpy32(ctx->iv, iv, sizeof(iv)); + FXSYS_memcpy(ctx->iv, iv, sizeof(iv)); } static void aes_encrypt(AESContext * ctx, unsigned int * block) { @@ -974,7 +974,7 @@ static void aes_encrypt_cbc(unsigned char *dest, const unsigned char *src, int l unsigned int iv[4]; int i; ASSERT((len & 15) == 0); - FXSYS_memcpy32(iv, ctx->iv, sizeof(iv)); + FXSYS_memcpy(iv, ctx->iv, sizeof(iv)); while (len > 0) { for (i = 0; i < 4; i++) { iv[i] ^= GET_32BIT_MSB_FIRST(src + 4 * i); @@ -987,7 +987,7 @@ static void aes_encrypt_cbc(unsigned char *dest, const unsigned char *src, int l src += 16; len -= 16; } - FXSYS_memcpy32(ctx->iv, iv, sizeof(iv)); + FXSYS_memcpy(ctx->iv, iv, sizeof(iv)); } void CRYPT_AESSetKey(void* context, FX_DWORD blocklen, const uint8_t* key, FX_DWORD keylen, FX_BOOL bEncrypt) { |