Land #1354 - enable SHA assembly on ELF Aarch64

2 files changed, 5 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac0ca31..4b15da9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -524,7 +524,9 @@ endif()
 
 if(ENABLE_ASM)
         if(CMAKE_C_COMPILER_ABI STREQUAL "ELF")
-                if(HOST_X86_64)
+                if(HOST_AARCH64)
+                        set(HOST_ASM_ELF_AARCH64 true)
+                elseif(HOST_X86_64)
                         set(HOST_ASM_ELF_X86_64 true)
                 elseif(SOLARIS AND HOST_I386)
                         set(HOST_ASM_ELF_X86_64 true)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index d566182..491b9b4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -22,8 +22,9 @@ if(HOST_ASM_ELF_AARCH64)
                 ASM_AARCH64_ELF_SRC
                 sha/sha1_aarch64_ce.S
                 sha/sha256_aarch64_ce.S
-                sha/sha256_aarch64_ce.S
+                sha/sha512_aarch64_ce.S
         )
+        add_definitions(-DLIBRESSL_USE_SHA_ASSEMBLY)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_AARCH64_ELF_SRC})
 endif()