From 818f1ca944ad6c5d6d7aaebbaf83411991471891 Mon Sep 17 00:00:00 2001 From: Sergiu Giurgiu Date: Wed, 3 Jun 2020 21:03:18 -0400 Subject: Fix conflicting Cryptogams API names on ARM with OpenSSL (GH #952) --- aes_armv4.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'aes_armv4.h') diff --git a/aes_armv4.h b/aes_armv4.h index 850526d7..122bcab5 100644 --- a/aes_armv4.h +++ b/aes_armv4.h @@ -18,8 +18,8 @@ extern "C" { // Instead of AES_KEY we use a 'word32 rkey[4*15+4]'. It has space for // both the AES_MAXNR round keys and the number of rounds in the tail. -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, unsigned int *rkey); -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, unsigned int *rkey); +int AES_set_encrypt_key_ARM(const unsigned char *userKey, const int bits, unsigned int *rkey); +int AES_set_decrypt_key_ARM(const unsigned char *userKey, const int bits, unsigned int *rkey); void AES_encrypt_block(const unsigned char *in, unsigned char *out, const unsigned int *rkey); void AES_decrypt_block(const unsigned char *in, unsigned char *out, const unsigned int *rkey); -- cgit v1.2.1