From 6660982a555c0488bb8f3fe5d7c808e5b2b782da Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 14 Oct 2018 07:39:08 -0400 Subject: [PATCH] Allow Cryptogam's AES thunk to be inlined --- rijndael.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rijndael.cpp b/rijndael.cpp index bbe81569..b8bbd6b0 100644 --- a/rijndael.cpp +++ b/rijndael.cpp @@ -345,25 +345,21 @@ extern size_t Rijndael_Dec_AdvancedProcessBlocks128_6x1_ALTIVEC(const word32 *su #endif #if (CRYPTOGAMS_ARM_AES) -int CRYPTOPP_NOINLINE -CRYPTOGAMS_set_encrypt_key(const byte *userKey, const int bitLen, word32 *rkey) +int CRYPTOGAMS_set_encrypt_key(const byte *userKey, const int bitLen, word32 *rkey) { return AES_set_encrypt_key(userKey, bitLen, rkey); } -int CRYPTOPP_NOINLINE -CRYPTOGAMS_set_decrypt_key(const byte *userKey, const int bitLen, word32 *rkey) +int CRYPTOGAMS_set_decrypt_key(const byte *userKey, const int bitLen, word32 *rkey) { return AES_set_decrypt_key(userKey, bitLen, rkey); } -void CRYPTOPP_NOINLINE -CRYPTOGAMS_encrypt(const byte *inBlock, const byte *xorBlock, byte *outBlock, const word32 *rkey) +void CRYPTOGAMS_encrypt(const byte *inBlock, const byte *xorBlock, byte *outBlock, const word32 *rkey) { AES_encrypt(inBlock, outBlock, rkey); if (xorBlock) xorbuf (outBlock, xorBlock, 16); } -void CRYPTOPP_NOINLINE -CRYPTOGAMS_decrypt(const byte *inBlock, const byte *xorBlock, byte *outBlock, const word32 *rkey) +void CRYPTOGAMS_decrypt(const byte *inBlock, const byte *xorBlock, byte *outBlock, const word32 *rkey) { AES_decrypt(inBlock, outBlock, rkey); if (xorBlock)