Fix conflicting Cryptogams API names on ARM with OpenSSL (GH #952)

1 files changed, 4 insertions, 4 deletions

diff --git a/rijndael.cpp b/rijndael.cpp
index 5ccc45f0..5ba53fcb 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -330,8 +330,8 @@ extern size_t Rijndael_Dec_AdvancedProcessBlocks_ARMV8(const word32 *subkeys, si
 #endif

 

 #if (CRYPTOGAMS_ARM_AES)

-extern "C" int AES_set_encrypt_key(const unsigned char *userKey, const int bitLen, word32 *rkey);

-extern "C" int AES_set_decrypt_key(const unsigned char *userKey, const int bitLen, word32 *rkey);

+extern "C" int AES_set_encrypt_key_ARM(const unsigned char *userKey, const int bitLen, word32 *rkey);

+extern "C" int AES_set_decrypt_key_ARM(const unsigned char *userKey, const int bitLen, word32 *rkey);

 extern "C" void AES_encrypt_block(const unsigned char *in, unsigned char *out, const word32 *rkey);

 extern "C" void AES_decrypt_block(const unsigned char *in, unsigned char *out, const word32 *rkey);

 #endif

@@ -349,11 +349,11 @@ extern size_t Rijndael_Dec_AdvancedProcessBlocks128_6x1_ALTIVEC(const word32 *su
 #if (CRYPTOGAMS_ARM_AES)

 int CRYPTOGAMS_set_encrypt_key(const byte *userKey, const int bitLen, word32 *rkey)

 {

-	return AES_set_encrypt_key(userKey, bitLen, rkey);

+	return AES_set_encrypt_key_ARM(userKey, bitLen, rkey);

 }

 int CRYPTOGAMS_set_decrypt_key(const byte *userKey, const int bitLen, word32 *rkey)

 {

-	return AES_set_decrypt_key(userKey, bitLen, rkey);

+	return AES_set_decrypt_key_ARM(userKey, bitLen, rkey);

 }

 void CRYPTOGAMS_encrypt(const byte *inBlock, const byte *xorBlock, byte *outBlock, const word32 *rkey)

 {