Restoring authorship annotation for <heretic@yandex-team.ru>. Commit 2 of 2.

1 files changed, 500 insertions, 500 deletions

diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make
index 4518ced107..3acfb0cac7 100644
--- a/contrib/libs/openssl/crypto/ya.make
+++ b/contrib/libs/openssl/crypto/ya.make
@@ -1,23 +1,23 @@
 LIBRARY()
 
-LICENSE( 
-    Apache-2.0 AND 
-    BSD-2-Clause AND 
-    BSD-3-Clause AND 
-    BSD-Source-Code AND 
-    CC0-1.0 AND 
-    OpenSSL AND 
-    Public-Domain AND 
-    Snprintf 
-) 
+LICENSE(
+    Apache-2.0 AND
+    BSD-2-Clause AND
+    BSD-3-Clause AND
+    BSD-Source-Code AND
+    CC0-1.0 AND
+    OpenSSL AND
+    Public-Domain AND
+    Snprintf
+)
+
+LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt) 
+OWNER(
+    somov
+    g:cpp-contrib
+)
 
-OWNER( 
-    somov 
-    g:cpp-contrib 
-) 
- 
 PEERDIR(
     contrib/libs/zlib
 )
@@ -34,41 +34,41 @@ ADDINCL(
 IF (OS_LINUX)
     IF (ARCH_ARM64)
         SET(LINUX_ARM64 yes)
-    ELSEIF (ARCH_ARM7) 
+    ELSEIF (ARCH_ARM7)
         SET(LINUX_ARMV7 yes)
-    ELSEIF (ARCH_X86_64) 
+    ELSEIF (ARCH_X86_64)
         SET(LINUX_X86_64 yes)
     ENDIF()
 ENDIF()
 
-IF (OS_IOS) 
-    IF (ARCH_ARM64) 
-        SET(IOS_ARM64 yes) 
-    ELSEIF (ARCH_ARM7) 
-        SET(IOS_ARMV7 yes) 
-    ELSEIF (ARCH_X86_64) 
-        SET(IOS_X86_64 yes) 
-    ELSEIF (ARCH_I386) 
-        SET(IOS_I386 yes) 
-    ENDIF() 
-ENDIF() 
- 
-IF (OS_ANDROID) 
-    IF (ARCH_ARM64) 
-        SET(ANDROID_ARM64 yes) 
-    ELSEIF (ARCH_ARM7) 
-        SET(ANDROID_ARMV7 yes) 
-    ELSEIF (ARCH_X86_64) 
-        SET(ANDROID_X86_64 yes) 
-    ELSEIF (ARCH_I686) 
-        SET(ANDROID_I686 yes) 
-    ENDIF() 
-ENDIF() 
- 
+IF (OS_IOS)
+    IF (ARCH_ARM64)
+        SET(IOS_ARM64 yes)
+    ELSEIF (ARCH_ARM7)
+        SET(IOS_ARMV7 yes)
+    ELSEIF (ARCH_X86_64)
+        SET(IOS_X86_64 yes)
+    ELSEIF (ARCH_I386)
+        SET(IOS_I386 yes)
+    ENDIF()
+ENDIF()
+
+IF (OS_ANDROID)
+    IF (ARCH_ARM64)
+        SET(ANDROID_ARM64 yes)
+    ELSEIF (ARCH_ARM7)
+        SET(ANDROID_ARMV7 yes)
+    ELSEIF (ARCH_X86_64)
+        SET(ANDROID_X86_64 yes)
+    ELSEIF (ARCH_I686)
+        SET(ANDROID_I686 yes)
+    ENDIF()
+ENDIF()
+
 IF (OS_WINDOWS)
     IF (ARCH_X86_64)
         SET(WINDOWS_X86_64 yes)
-    ELSEIF (ARCH_I686) 
+    ELSEIF (ARCH_I686)
         SET(WINDOWS_I686 yes)
     ENDIF()
 ENDIF()
@@ -98,24 +98,24 @@ IF (NOT IOS_ARM64 AND NOT DARWIN_ARM64)
 ENDIF()
 
 IF (NOT WINDOWS_I686)
-    CFLAGS( 
+    CFLAGS(
         -DECP_NISTZ256_ASM
         -DPOLY1305_ASM
     )
 ENDIF()
 
 IF (NOT IOS_I386 AND NOT ANDROID_I686 AND NOT WINDOWS_I686)
-    CFLAGS( 
-        -DKECCAK1600_ASM 
-    ) 
-ENDIF() 
- 
+    CFLAGS(
+        -DKECCAK1600_ASM
+    )
+ENDIF()
+
 IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
-    CFLAGS( 
-        -DVPAES_ASM 
-    ) 
-ENDIF() 
- 
+    CFLAGS(
+        -DVPAES_ASM
+    )
+ENDIF()
+
 IF (NOT OS_WINDOWS)
     CFLAGS(
         -DENGINESDIR=\"/usr/local/lib/engines-1.1\"
@@ -137,32 +137,32 @@ IF (OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH
 ENDIF()
 
 IF (OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
-    CFLAGS( 
-        -DOPENSSL_USE_NODELETE 
-    ) 
+    CFLAGS(
+        -DOPENSSL_USE_NODELETE
+    )
 ENDIF()
 
 IF (OS_DARWIN AND ARCH_X86_64)
-    CFLAGS( 
-        -D_REENTRANT 
-    ) 
+    CFLAGS(
+        -D_REENTRANT
+    )
+ENDIF()
+
+IF (OS_DARWIN AND ARCH_ARM64)
+    CFLAGS(
+        -DL_ENDIAN
+        -DOPENSSL_PIC
+        -D_REENTRANT
+    )
 ENDIF()
 
-IF (OS_DARWIN AND ARCH_ARM64) 
-    CFLAGS( 
-        -DL_ENDIAN 
-        -DOPENSSL_PIC 
-        -D_REENTRANT 
-    ) 
-ENDIF() 
- 
 IF (OS_WINDOWS)
     IF (ARCH_X86_64)
         CFLAGS(
             -DENGINESDIR="\"C:\\\\Program\ Files\\\\OpenSSL\\\\lib\\\\engines-1_1\""
             -DOPENSSLDIR="\"C:\\\\Program\ Files\\\\Common\ Files\\\\SSL\""
         )
-    ELSEIF (ARCH_I386) 
+    ELSEIF (ARCH_I386)
         CFLAGS(
             -DENGINESDIR="\"C:\\\\Program\ Files\ \(x86\)\\\\OpenSSL\\\\lib\\\\engines-1_1\""
             -DOPENSSLDIR="\"C:\\\\Program\ Files\ \(x86\)\\\\Common\ Files\\\\SSL\""
@@ -180,33 +180,33 @@ IF (OS_WINDOWS)
 ENDIF()
 
 IF (SANITIZER_TYPE == memory)
-    CFLAGS( 
-        -DPURIFY 
-    ) 
+    CFLAGS(
+        -DPURIFY
+    )
 ENDIF()
 
 IF (MUSL)
-    CFLAGS( 
-        -DOPENSSL_NO_ASYNC 
-    ) 
+    CFLAGS(
+        -DOPENSSL_NO_ASYNC
+    )
 ENDIF()
 
 IF (ARCH_TYPE_32)
-    CFLAGS( 
-        -DOPENSSL_NO_EC_NISTP_64_GCC_128 
-    ) 
+    CFLAGS(
+        -DOPENSSL_NO_EC_NISTP_64_GCC_128
+    )
 ENDIF()
 
 IF (ARCH_X86_64 AND NOT MSVC)
-    SET_APPEND( 
-        SFLAGS 
-        -mavx512bw 
-        -mavx512ifma 
-        -mavx512vl 
-    ) 
+    SET_APPEND(
+        SFLAGS
+        -mavx512bw
+        -mavx512ifma
+        -mavx512vl
+    )
 ENDIF()
 
-IF (OS_WINDOWS) 
+IF (OS_WINDOWS)
     SET_COMPILE_OUTPUTS_MODIFIERS(NOREL)
 ENDIF()
 
@@ -818,48 +818,48 @@ IF (NOT WINDOWS_I686)
     )
 ENDIF()
 
-IF (NOT IOS_ARM64 AND NOT IOS_ARMV7) 
-    SRCS( 
-        engine/eng_all.c 
-        engine/eng_cnf.c 
-        engine/eng_ctrl.c 
-        engine/eng_dyn.c 
-        engine/eng_err.c 
-        engine/eng_fat.c 
-        engine/eng_init.c 
-        engine/eng_lib.c 
-        engine/eng_list.c 
-        engine/eng_openssl.c 
-        engine/eng_pkey.c 
-        engine/eng_rdrand.c 
-        engine/eng_table.c 
-        engine/tb_asnmth.c 
-        engine/tb_cipher.c 
-        engine/tb_dh.c 
-        engine/tb_digest.c 
-        engine/tb_dsa.c 
-        engine/tb_eckey.c 
-        engine/tb_pkmeth.c 
-        engine/tb_rand.c 
-        engine/tb_rsa.c 
-    ) 
-ENDIF() 
- 
+IF (NOT IOS_ARM64 AND NOT IOS_ARMV7)
+    SRCS(
+        engine/eng_all.c
+        engine/eng_cnf.c
+        engine/eng_ctrl.c
+        engine/eng_dyn.c
+        engine/eng_err.c
+        engine/eng_fat.c
+        engine/eng_init.c
+        engine/eng_lib.c
+        engine/eng_list.c
+        engine/eng_openssl.c
+        engine/eng_pkey.c
+        engine/eng_rdrand.c
+        engine/eng_table.c
+        engine/tb_asnmth.c
+        engine/tb_cipher.c
+        engine/tb_dh.c
+        engine/tb_digest.c
+        engine/tb_dsa.c
+        engine/tb_eckey.c
+        engine/tb_pkmeth.c
+        engine/tb_rand.c
+        engine/tb_rsa.c
+    )
+ENDIF()
+
 IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
-    SRCS( 
-        aes/aes_core.c 
-    ) 
-ENDIF() 
- 
+    SRCS(
+        aes/aes_core.c
+    )
+ENDIF()
+
 IF (NOT IOS_I386 AND NOT ANDROID_I686 AND NOT WINDOWS_I686)
-    SRCS( 
-        bf/bf_enc.c 
-        camellia/cmll_misc.c 
-        des/des_enc.c 
-        des/fcrypt_b.c 
-    ) 
-ENDIF() 
- 
+    SRCS(
+        bf/bf_enc.c
+        camellia/cmll_misc.c
+        des/des_enc.c
+        des/fcrypt_b.c
+    )
+ENDIF()
+
 IF (OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
         bn/rsaz_exp.c
@@ -911,39 +911,39 @@ IF (OS_DARWIN AND ARCH_X86_64)
     )
 ENDIF()
 
-IF (OS_DARWIN AND ARCH_ARM64) 
-    SRCS( 
-        ../asm/darwin-arm64/crypto/sha/keccak1600-armv8.S 
-        ../asm/darwin-arm64/crypto/sha/sha512-armv8.S 
-        ../asm/darwin-arm64/crypto/sha/sha1-armv8.S 
-        ../asm/darwin-arm64/crypto/sha/sha256-armv8.S 
-        ../asm/darwin-arm64/crypto/poly1305/poly1305-armv8.S 
-        ../asm/darwin-arm64/crypto/ec/ecp_nistz256-armv8.S 
-        ../asm/darwin-arm64/crypto/chacha/chacha-armv8.S 
-        ../asm/darwin-arm64/crypto/bn/armv8-mont.S 
-        ../asm/darwin-arm64/crypto/arm64cpuid.S 
-        ../asm/darwin-arm64/crypto/aes/aesv8-armx.S 
-        ../asm/darwin-arm64/crypto/aes/vpaes-armv8.S 
-        ../asm/darwin-arm64/crypto/modes/ghashv8-armx.S 
-        armcap.c 
-        bn/bn_asm.c 
-        camellia/camellia.c 
-        camellia/cmll_cbc.c 
+IF (OS_DARWIN AND ARCH_ARM64)
+    SRCS(
+        ../asm/darwin-arm64/crypto/sha/keccak1600-armv8.S
+        ../asm/darwin-arm64/crypto/sha/sha512-armv8.S
+        ../asm/darwin-arm64/crypto/sha/sha1-armv8.S
+        ../asm/darwin-arm64/crypto/sha/sha256-armv8.S
+        ../asm/darwin-arm64/crypto/poly1305/poly1305-armv8.S
+        ../asm/darwin-arm64/crypto/ec/ecp_nistz256-armv8.S
+        ../asm/darwin-arm64/crypto/chacha/chacha-armv8.S
+        ../asm/darwin-arm64/crypto/bn/armv8-mont.S
+        ../asm/darwin-arm64/crypto/arm64cpuid.S
+        ../asm/darwin-arm64/crypto/aes/aesv8-armx.S
+        ../asm/darwin-arm64/crypto/aes/vpaes-armv8.S
+        ../asm/darwin-arm64/crypto/modes/ghashv8-armx.S
+        armcap.c
+        bn/bn_asm.c
+        camellia/camellia.c
+        camellia/cmll_cbc.c
         dso/dso_dlfcn.c
-        rc4/rc4_enc.c 
-        rc4/rc4_skey.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
+        rc4/rc4_enc.c
+        rc4/rc4_skey.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
 IF (OS_LINUX AND ARCH_ARM7)
     IF (CLANG)
         # XXX: This is a workarond for 'out of range immediate fixup value'
         # error with clang integrated assembler:
         # https://github.com/openssl/openssl/issues/7878
-        CFLAGS( 
-            -mno-thumb 
-        ) 
+        CFLAGS(
+            -mno-thumb
+        )
     ENDIF()
     CFLAGS(
         -DOPENSSL_PIC
@@ -1066,35 +1066,35 @@ ENDIF()
 
 IF (OS_WINDOWS AND ARCH_X86_64)
     SRCS(
-        ../asm/windows/crypto/aes/aesni-mb-x86_64.masm 
-        ../asm/windows/crypto/aes/aesni-sha1-x86_64.masm 
-        ../asm/windows/crypto/aes/aesni-sha256-x86_64.masm 
-        ../asm/windows/crypto/aes/aesni-x86_64.masm 
-        ../asm/windows/crypto/aes/vpaes-x86_64.masm 
-        ../asm/windows/crypto/bn/rsaz-avx2.masm 
-        ../asm/windows/crypto/bn/rsaz-x86_64.masm 
-        ../asm/windows/crypto/bn/x86_64-gf2m.masm 
-        ../asm/windows/crypto/bn/x86_64-mont.masm 
-        ../asm/windows/crypto/bn/x86_64-mont5.masm 
-        ../asm/windows/crypto/camellia/cmll-x86_64.masm 
-        ../asm/windows/crypto/chacha/chacha-x86_64.masm 
-        ../asm/windows/crypto/ec/ecp_nistz256-x86_64.masm 
-        ../asm/windows/crypto/ec/x25519-x86_64.masm 
-        ../asm/windows/crypto/md5/md5-x86_64.masm 
-        ../asm/windows/crypto/modes/aesni-gcm-x86_64.masm 
-        ../asm/windows/crypto/modes/ghash-x86_64.masm 
-        ../asm/windows/crypto/poly1305/poly1305-x86_64.masm 
-        ../asm/windows/crypto/rc4/rc4-md5-x86_64.masm 
-        ../asm/windows/crypto/rc4/rc4-x86_64.masm 
-        ../asm/windows/crypto/sha/keccak1600-x86_64.masm 
-        ../asm/windows/crypto/sha/sha1-mb-x86_64.masm 
-        ../asm/windows/crypto/sha/sha1-x86_64.masm 
-        ../asm/windows/crypto/sha/sha256-mb-x86_64.masm 
-        ../asm/windows/crypto/sha/sha256-x86_64.masm 
-        ../asm/windows/crypto/sha/sha512-x86_64.masm 
-        ../asm/windows/crypto/whrlpool/wp-x86_64.masm 
-        ../asm/windows/crypto/uplink-x86_64.masm 
-        ../asm/windows/crypto/x86_64cpuid.masm 
+        ../asm/windows/crypto/aes/aesni-mb-x86_64.masm
+        ../asm/windows/crypto/aes/aesni-sha1-x86_64.masm
+        ../asm/windows/crypto/aes/aesni-sha256-x86_64.masm
+        ../asm/windows/crypto/aes/aesni-x86_64.masm
+        ../asm/windows/crypto/aes/vpaes-x86_64.masm
+        ../asm/windows/crypto/bn/rsaz-avx2.masm
+        ../asm/windows/crypto/bn/rsaz-x86_64.masm
+        ../asm/windows/crypto/bn/x86_64-gf2m.masm
+        ../asm/windows/crypto/bn/x86_64-mont.masm
+        ../asm/windows/crypto/bn/x86_64-mont5.masm
+        ../asm/windows/crypto/camellia/cmll-x86_64.masm
+        ../asm/windows/crypto/chacha/chacha-x86_64.masm
+        ../asm/windows/crypto/ec/ecp_nistz256-x86_64.masm
+        ../asm/windows/crypto/ec/x25519-x86_64.masm
+        ../asm/windows/crypto/md5/md5-x86_64.masm
+        ../asm/windows/crypto/modes/aesni-gcm-x86_64.masm
+        ../asm/windows/crypto/modes/ghash-x86_64.masm
+        ../asm/windows/crypto/poly1305/poly1305-x86_64.masm
+        ../asm/windows/crypto/rc4/rc4-md5-x86_64.masm
+        ../asm/windows/crypto/rc4/rc4-x86_64.masm
+        ../asm/windows/crypto/sha/keccak1600-x86_64.masm
+        ../asm/windows/crypto/sha/sha1-mb-x86_64.masm
+        ../asm/windows/crypto/sha/sha1-x86_64.masm
+        ../asm/windows/crypto/sha/sha256-mb-x86_64.masm
+        ../asm/windows/crypto/sha/sha256-x86_64.masm
+        ../asm/windows/crypto/sha/sha512-x86_64.masm
+        ../asm/windows/crypto/whrlpool/wp-x86_64.masm
+        ../asm/windows/crypto/uplink-x86_64.masm
+        ../asm/windows/crypto/x86_64cpuid.masm
     )
 ENDIF()
 
@@ -1128,329 +1128,329 @@ IF (OS_WINDOWS AND ARCH_I386)
     )
 ENDIF()
 
-IF (OS_IOS AND ARCH_ARM64) 
-    CFLAGS( 
-        -DOPENSSL_PIC 
-        -D_REENTRANT 
-    ) 
-    SRCS( 
-        ../asm/ios/arm64/crypto/aes/aesv8-armx.S 
-        ../asm/ios/arm64/crypto/aes/vpaes-armv8.S 
-        ../asm/ios/arm64/crypto/arm64cpuid.S 
-        ../asm/ios/arm64/crypto/bn/armv8-mont.S 
-        ../asm/ios/arm64/crypto/chacha/chacha-armv8.S 
-        ../asm/ios/arm64/crypto/ec/ecp_nistz256-armv8.S 
-        ../asm/ios/arm64/crypto/modes/ghashv8-armx.S 
-        ../asm/ios/arm64/crypto/poly1305/poly1305-armv8.S 
-        ../asm/ios/arm64/crypto/sha/keccak1600-armv8.S 
-        ../asm/ios/arm64/crypto/sha/sha1-armv8.S 
-        ../asm/ios/arm64/crypto/sha/sha256-armv8.S 
-        ../asm/ios/arm64/crypto/sha/sha512-armv8.S 
-        armcap.c 
-        bn/bn_asm.c 
-        camellia/camellia.c 
-        camellia/cmll_cbc.c 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        rc4/rc4_enc.c 
-        rc4/rc4_skey.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
-IF (OS_IOS AND ARCH_ARM7) 
-    CFLAGS( 
-        -DOPENSSL_PIC 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DAES_ASM 
-        -DBSAES_ASM 
-        -DGHASH_ASM 
-        -D_REENTRANT 
-    ) 
-    SRCS( 
-        ../asm/ios/armv7/crypto/modes/ghash-armv4.S 
-        ../asm/ios/armv7/crypto/modes/ghashv8-armx.S 
-        ../asm/ios/armv7/crypto/chacha/chacha-armv4.S 
-        ../asm/ios/armv7/crypto/ec/ecp_nistz256-armv4.S 
-        ../asm/ios/armv7/crypto/poly1305/poly1305-armv4.S 
-        ../asm/ios/armv7/crypto/bn/armv4-gf2m.S 
-        ../asm/ios/armv7/crypto/bn/armv4-mont.S 
-        ../asm/ios/armv7/crypto/sha/sha512-armv4.S 
-        ../asm/ios/armv7/crypto/sha/sha1-armv4-large.S 
-        ../asm/ios/armv7/crypto/sha/sha256-armv4.S 
-        ../asm/ios/armv7/crypto/sha/keccak1600-armv4.S 
-        ../asm/ios/armv7/crypto/armv4cpuid.S 
-        ../asm/ios/armv7/crypto/aes/aesv8-armx.S 
-        ../asm/ios/armv7/crypto/aes/bsaes-armv7.S 
-        ../asm/ios/armv7/crypto/aes/aes-armv4.S 
-        armcap.c 
-        bn/bn_asm.c 
-        camellia/camellia.c 
-        camellia/cmll_cbc.c 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        rc4/rc4_enc.c 
-        rc4/rc4_skey.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
-IF (OS_IOS AND ARCH_X86_64) 
-    CFLAGS( 
-        -DL_ENDIAN 
-        -DOPENSSL_PIC 
-        -DOPENSSL_IA32_SSE2 
-        -DOPENSSL_BN_ASM_MONT5 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DRC4_ASM 
-        -DMD5_ASM 
-        -DGHASH_ASM 
-        -DECP_NISTZ256_ASM 
-        -DX25519_ASM 
-        -D_REENTRANT 
-    ) 
-    SRCS( 
-        ../asm/ios/x86_64/crypto/md5/md5-x86_64.s 
-        ../asm/ios/x86_64/crypto/rc4/rc4-md5-x86_64.s 
-        ../asm/ios/x86_64/crypto/rc4/rc4-x86_64.s 
-        ../asm/ios/x86_64/crypto/modes/ghash-x86_64.s 
-        ../asm/ios/x86_64/crypto/modes/aesni-gcm-x86_64.s 
-        ../asm/ios/x86_64/crypto/chacha/chacha-x86_64.s 
-        ../asm/ios/x86_64/crypto/ec/ecp_nistz256-x86_64.s 
-        ../asm/ios/x86_64/crypto/ec/x25519-x86_64.s 
-        ../asm/ios/x86_64/crypto/x86_64cpuid.s 
-        ../asm/ios/x86_64/crypto/poly1305/poly1305-x86_64.s 
-        ../asm/ios/x86_64/crypto/bn/rsaz-x86_64.s 
-        ../asm/ios/x86_64/crypto/bn/x86_64-mont.s 
-        ../asm/ios/x86_64/crypto/bn/x86_64-gf2m.s 
-        ../asm/ios/x86_64/crypto/bn/x86_64-mont5.s 
-        ../asm/ios/x86_64/crypto/bn/rsaz-avx2.s 
-        ../asm/ios/x86_64/crypto/sha/sha512-x86_64.s 
-        ../asm/ios/x86_64/crypto/sha/sha256-x86_64.s 
-        ../asm/ios/x86_64/crypto/sha/keccak1600-x86_64.s 
-        ../asm/ios/x86_64/crypto/sha/sha1-x86_64.s 
-        ../asm/ios/x86_64/crypto/sha/sha1-mb-x86_64.s 
-        ../asm/ios/x86_64/crypto/sha/sha256-mb-x86_64.s 
-        ../asm/ios/x86_64/crypto/camellia/cmll-x86_64.s 
-        ../asm/ios/x86_64/crypto/whrlpool/wp-x86_64.s 
-        ../asm/ios/x86_64/crypto/aes/vpaes-x86_64.s 
-        ../asm/ios/x86_64/crypto/aes/aesni-sha1-x86_64.s 
-        ../asm/ios/x86_64/crypto/aes/aesni-sha256-x86_64.s 
-        ../asm/ios/x86_64/crypto/aes/aesni-x86_64.s 
-        ../asm/ios/x86_64/crypto/aes/aesni-mb-x86_64.s 
-        bn/asm/x86_64-gcc.c 
-        bn/rsaz_exp.c 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-    ) 
-ENDIF() 
- 
-IF (OS_IOS AND ARCH_I386) 
-    CFLAGS( 
-        -DL_ENDIAN 
-        -DOPENSSL_PIC 
-        -DOPENSSL_BN_ASM_PART_WORDS 
-        -DOPENSSL_IA32_SSE2 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DRC4_ASM 
-        -DMD5_ASM 
-        -DRMD160_ASM 
-        -DWHIRLPOOL_ASM 
-        -DGHASH_ASM 
-        -D_REENTRANT 
-    ) 
-    SRCS( 
-        ../asm/ios/i386/crypto/md5/md5-586.s 
-        ../asm/ios/i386/crypto/rc4/rc4-586.s 
-        ../asm/ios/i386/crypto/des/des-586.s 
-        ../asm/ios/i386/crypto/des/crypt586.s 
-        ../asm/ios/i386/crypto/modes/ghash-x86.s 
-        ../asm/ios/i386/crypto/x86cpuid.s 
-        ../asm/ios/i386/crypto/chacha/chacha-x86.s 
-        ../asm/ios/i386/crypto/ec/ecp_nistz256-x86.s 
-        ../asm/ios/i386/crypto/poly1305/poly1305-x86.s 
-        ../asm/ios/i386/crypto/bf/bf-586.s 
-        ../asm/ios/i386/crypto/bn/co-586.s 
-        ../asm/ios/i386/crypto/bn/x86-mont.s 
-        ../asm/ios/i386/crypto/bn/x86-gf2m.s 
-        ../asm/ios/i386/crypto/bn/bn-586.s 
-        ../asm/ios/i386/crypto/sha/sha512-586.s 
-        ../asm/ios/i386/crypto/sha/sha1-586.s 
-        ../asm/ios/i386/crypto/sha/sha256-586.s 
-        ../asm/ios/i386/crypto/camellia/cmll-x86.s 
-        ../asm/ios/i386/crypto/whrlpool/wp-mmx.s 
-        ../asm/ios/i386/crypto/ripemd/rmd-586.s 
-        ../asm/ios/i386/crypto/aes/vpaes-x86.s 
-        ../asm/ios/i386/crypto/aes/aesni-x86.s 
-        ../asm/ios/i386/engines/e_padlock-x86.s 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        sha/keccak1600.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
-IF (OS_ANDROID AND ARCH_X86_64) 
-    CFLAGS( 
-        -DOPENSSL_USE_NODELETE 
-        -DOPENSSL_PIC 
-        -DOPENSSL_IA32_SSE2 
-        -DOPENSSL_BN_ASM_MONT5 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DRC4_ASM 
-        -DMD5_ASM 
-        -DGHASH_ASM 
-        -DX25519_ASM 
-    ) 
-    SRCS( 
-        ../asm/android/x86_64/crypto/ec/x25519-x86_64.s 
-        ../asm/android/x86_64/crypto/ec/ecp_nistz256-x86_64.s 
-        ../asm/android/x86_64/crypto/md5/md5-x86_64.s 
-        ../asm/android/x86_64/crypto/rc4/rc4-x86_64.s 
-        ../asm/android/x86_64/crypto/rc4/rc4-md5-x86_64.s 
-        ../asm/android/x86_64/crypto/whrlpool/wp-x86_64.s 
-        ../asm/android/x86_64/crypto/poly1305/poly1305-x86_64.s 
-        ../asm/android/x86_64/crypto/x86_64cpuid.s 
-        ../asm/android/x86_64/crypto/camellia/cmll-x86_64.s 
-        ../asm/android/x86_64/crypto/bn/x86_64-mont5.s 
-        ../asm/android/x86_64/crypto/bn/rsaz-avx2.s 
-        ../asm/android/x86_64/crypto/bn/rsaz-x86_64.s 
-        ../asm/android/x86_64/crypto/bn/x86_64-mont.s 
-        ../asm/android/x86_64/crypto/bn/x86_64-gf2m.s 
-        ../asm/android/x86_64/crypto/aes/aesni-sha256-x86_64.s 
-        ../asm/android/x86_64/crypto/aes/aesni-mb-x86_64.s 
-        ../asm/android/x86_64/crypto/aes/aesni-x86_64.s 
-        ../asm/android/x86_64/crypto/aes/vpaes-x86_64.s 
-        ../asm/android/x86_64/crypto/aes/aesni-sha1-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/sha256-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/sha1-mb-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/sha1-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/sha256-mb-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/sha512-x86_64.s 
-        ../asm/android/x86_64/crypto/sha/keccak1600-x86_64.s 
-        ../asm/android/x86_64/crypto/chacha/chacha-x86_64.s 
-        ../asm/android/x86_64/crypto/modes/ghash-x86_64.s 
-        ../asm/android/x86_64/crypto/modes/aesni-gcm-x86_64.s 
-        bn/asm/x86_64-gcc.c 
-        bn/rsaz_exp.c 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-    ) 
-ENDIF() 
- 
-IF (OS_ANDROID AND ARCH_I686) 
-    CFLAGS( 
-        -DOPENSSL_PIC 
-        -DOPENSSL_BN_ASM_PART_WORDS 
-        -DOPENSSL_IA32_SSE2 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DRC4_ASM 
-        -DMD5_ASM 
-        -DRMD160_ASM 
-        -DWHIRLPOOL_ASM 
-        -DGHASH_ASM 
-    ) 
-    SRCS( 
-        ../asm/android/i686/crypto/ec/ecp_nistz256-x86.s 
-        ../asm/android/i686/crypto/bf/bf-586.s 
-        ../asm/android/i686/crypto/md5/md5-586.s 
-        ../asm/android/i686/crypto/rc4/rc4-586.s 
-        ../asm/android/i686/crypto/whrlpool/wp-mmx.s 
-        ../asm/android/i686/crypto/x86cpuid.s 
-        ../asm/android/i686/crypto/des/crypt586.s 
-        ../asm/android/i686/crypto/des/des-586.s 
-        ../asm/android/i686/crypto/poly1305/poly1305-x86.s 
-        ../asm/android/i686/crypto/ripemd/rmd-586.s 
-        ../asm/android/i686/crypto/camellia/cmll-x86.s 
-        ../asm/android/i686/crypto/bn/bn-586.s 
-        ../asm/android/i686/crypto/bn/co-586.s 
-        ../asm/android/i686/crypto/bn/x86-gf2m.s 
-        ../asm/android/i686/crypto/bn/x86-mont.s 
-        ../asm/android/i686/crypto/aes/aesni-x86.s 
-        ../asm/android/i686/crypto/aes/vpaes-x86.s 
-        ../asm/android/i686/crypto/sha/sha512-586.s 
-        ../asm/android/i686/crypto/sha/sha256-586.s 
-        ../asm/android/i686/crypto/sha/sha1-586.s 
-        ../asm/android/i686/crypto/chacha/chacha-x86.s 
-        ../asm/android/i686/crypto/modes/ghash-x86.s 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        sha/keccak1600.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
-IF (OS_ANDROID AND ARCH_ARM7) 
+IF (OS_IOS AND ARCH_ARM64)
+    CFLAGS(
+        -DOPENSSL_PIC
+        -D_REENTRANT
+    )
+    SRCS(
+        ../asm/ios/arm64/crypto/aes/aesv8-armx.S
+        ../asm/ios/arm64/crypto/aes/vpaes-armv8.S
+        ../asm/ios/arm64/crypto/arm64cpuid.S
+        ../asm/ios/arm64/crypto/bn/armv8-mont.S
+        ../asm/ios/arm64/crypto/chacha/chacha-armv8.S
+        ../asm/ios/arm64/crypto/ec/ecp_nistz256-armv8.S
+        ../asm/ios/arm64/crypto/modes/ghashv8-armx.S
+        ../asm/ios/arm64/crypto/poly1305/poly1305-armv8.S
+        ../asm/ios/arm64/crypto/sha/keccak1600-armv8.S
+        ../asm/ios/arm64/crypto/sha/sha1-armv8.S
+        ../asm/ios/arm64/crypto/sha/sha256-armv8.S
+        ../asm/ios/arm64/crypto/sha/sha512-armv8.S
+        armcap.c
+        bn/bn_asm.c
+        camellia/camellia.c
+        camellia/cmll_cbc.c
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        rc4/rc4_enc.c
+        rc4/rc4_skey.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
+IF (OS_IOS AND ARCH_ARM7)
+    CFLAGS(
+        -DOPENSSL_PIC
+        -DOPENSSL_BN_ASM_GF2m
+        -DAES_ASM
+        -DBSAES_ASM
+        -DGHASH_ASM
+        -D_REENTRANT
+    )
+    SRCS(
+        ../asm/ios/armv7/crypto/modes/ghash-armv4.S
+        ../asm/ios/armv7/crypto/modes/ghashv8-armx.S
+        ../asm/ios/armv7/crypto/chacha/chacha-armv4.S
+        ../asm/ios/armv7/crypto/ec/ecp_nistz256-armv4.S
+        ../asm/ios/armv7/crypto/poly1305/poly1305-armv4.S
+        ../asm/ios/armv7/crypto/bn/armv4-gf2m.S
+        ../asm/ios/armv7/crypto/bn/armv4-mont.S
+        ../asm/ios/armv7/crypto/sha/sha512-armv4.S
+        ../asm/ios/armv7/crypto/sha/sha1-armv4-large.S
+        ../asm/ios/armv7/crypto/sha/sha256-armv4.S
+        ../asm/ios/armv7/crypto/sha/keccak1600-armv4.S
+        ../asm/ios/armv7/crypto/armv4cpuid.S
+        ../asm/ios/armv7/crypto/aes/aesv8-armx.S
+        ../asm/ios/armv7/crypto/aes/bsaes-armv7.S
+        ../asm/ios/armv7/crypto/aes/aes-armv4.S
+        armcap.c
+        bn/bn_asm.c
+        camellia/camellia.c
+        camellia/cmll_cbc.c
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        rc4/rc4_enc.c
+        rc4/rc4_skey.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
+IF (OS_IOS AND ARCH_X86_64)
+    CFLAGS(
+        -DL_ENDIAN
+        -DOPENSSL_PIC
+        -DOPENSSL_IA32_SSE2
+        -DOPENSSL_BN_ASM_MONT5
+        -DOPENSSL_BN_ASM_GF2m
+        -DRC4_ASM
+        -DMD5_ASM
+        -DGHASH_ASM
+        -DECP_NISTZ256_ASM
+        -DX25519_ASM
+        -D_REENTRANT
+    )
+    SRCS(
+        ../asm/ios/x86_64/crypto/md5/md5-x86_64.s
+        ../asm/ios/x86_64/crypto/rc4/rc4-md5-x86_64.s
+        ../asm/ios/x86_64/crypto/rc4/rc4-x86_64.s
+        ../asm/ios/x86_64/crypto/modes/ghash-x86_64.s
+        ../asm/ios/x86_64/crypto/modes/aesni-gcm-x86_64.s
+        ../asm/ios/x86_64/crypto/chacha/chacha-x86_64.s
+        ../asm/ios/x86_64/crypto/ec/ecp_nistz256-x86_64.s
+        ../asm/ios/x86_64/crypto/ec/x25519-x86_64.s
+        ../asm/ios/x86_64/crypto/x86_64cpuid.s
+        ../asm/ios/x86_64/crypto/poly1305/poly1305-x86_64.s
+        ../asm/ios/x86_64/crypto/bn/rsaz-x86_64.s
+        ../asm/ios/x86_64/crypto/bn/x86_64-mont.s
+        ../asm/ios/x86_64/crypto/bn/x86_64-gf2m.s
+        ../asm/ios/x86_64/crypto/bn/x86_64-mont5.s
+        ../asm/ios/x86_64/crypto/bn/rsaz-avx2.s
+        ../asm/ios/x86_64/crypto/sha/sha512-x86_64.s
+        ../asm/ios/x86_64/crypto/sha/sha256-x86_64.s
+        ../asm/ios/x86_64/crypto/sha/keccak1600-x86_64.s
+        ../asm/ios/x86_64/crypto/sha/sha1-x86_64.s
+        ../asm/ios/x86_64/crypto/sha/sha1-mb-x86_64.s
+        ../asm/ios/x86_64/crypto/sha/sha256-mb-x86_64.s
+        ../asm/ios/x86_64/crypto/camellia/cmll-x86_64.s
+        ../asm/ios/x86_64/crypto/whrlpool/wp-x86_64.s
+        ../asm/ios/x86_64/crypto/aes/vpaes-x86_64.s
+        ../asm/ios/x86_64/crypto/aes/aesni-sha1-x86_64.s
+        ../asm/ios/x86_64/crypto/aes/aesni-sha256-x86_64.s
+        ../asm/ios/x86_64/crypto/aes/aesni-x86_64.s
+        ../asm/ios/x86_64/crypto/aes/aesni-mb-x86_64.s
+        bn/asm/x86_64-gcc.c
+        bn/rsaz_exp.c
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+    )
+ENDIF()
+
+IF (OS_IOS AND ARCH_I386)
+    CFLAGS(
+        -DL_ENDIAN
+        -DOPENSSL_PIC
+        -DOPENSSL_BN_ASM_PART_WORDS
+        -DOPENSSL_IA32_SSE2
+        -DOPENSSL_BN_ASM_GF2m
+        -DRC4_ASM
+        -DMD5_ASM
+        -DRMD160_ASM
+        -DWHIRLPOOL_ASM
+        -DGHASH_ASM
+        -D_REENTRANT
+    )
+    SRCS(
+        ../asm/ios/i386/crypto/md5/md5-586.s
+        ../asm/ios/i386/crypto/rc4/rc4-586.s
+        ../asm/ios/i386/crypto/des/des-586.s
+        ../asm/ios/i386/crypto/des/crypt586.s
+        ../asm/ios/i386/crypto/modes/ghash-x86.s
+        ../asm/ios/i386/crypto/x86cpuid.s
+        ../asm/ios/i386/crypto/chacha/chacha-x86.s
+        ../asm/ios/i386/crypto/ec/ecp_nistz256-x86.s
+        ../asm/ios/i386/crypto/poly1305/poly1305-x86.s
+        ../asm/ios/i386/crypto/bf/bf-586.s
+        ../asm/ios/i386/crypto/bn/co-586.s
+        ../asm/ios/i386/crypto/bn/x86-mont.s
+        ../asm/ios/i386/crypto/bn/x86-gf2m.s
+        ../asm/ios/i386/crypto/bn/bn-586.s
+        ../asm/ios/i386/crypto/sha/sha512-586.s
+        ../asm/ios/i386/crypto/sha/sha1-586.s
+        ../asm/ios/i386/crypto/sha/sha256-586.s
+        ../asm/ios/i386/crypto/camellia/cmll-x86.s
+        ../asm/ios/i386/crypto/whrlpool/wp-mmx.s
+        ../asm/ios/i386/crypto/ripemd/rmd-586.s
+        ../asm/ios/i386/crypto/aes/vpaes-x86.s
+        ../asm/ios/i386/crypto/aes/aesni-x86.s
+        ../asm/ios/i386/engines/e_padlock-x86.s
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        sha/keccak1600.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
+IF (OS_ANDROID AND ARCH_X86_64)
+    CFLAGS(
+        -DOPENSSL_USE_NODELETE
+        -DOPENSSL_PIC
+        -DOPENSSL_IA32_SSE2
+        -DOPENSSL_BN_ASM_MONT5
+        -DOPENSSL_BN_ASM_GF2m
+        -DRC4_ASM
+        -DMD5_ASM
+        -DGHASH_ASM
+        -DX25519_ASM
+    )
+    SRCS(
+        ../asm/android/x86_64/crypto/ec/x25519-x86_64.s
+        ../asm/android/x86_64/crypto/ec/ecp_nistz256-x86_64.s
+        ../asm/android/x86_64/crypto/md5/md5-x86_64.s
+        ../asm/android/x86_64/crypto/rc4/rc4-x86_64.s
+        ../asm/android/x86_64/crypto/rc4/rc4-md5-x86_64.s
+        ../asm/android/x86_64/crypto/whrlpool/wp-x86_64.s
+        ../asm/android/x86_64/crypto/poly1305/poly1305-x86_64.s
+        ../asm/android/x86_64/crypto/x86_64cpuid.s
+        ../asm/android/x86_64/crypto/camellia/cmll-x86_64.s
+        ../asm/android/x86_64/crypto/bn/x86_64-mont5.s
+        ../asm/android/x86_64/crypto/bn/rsaz-avx2.s
+        ../asm/android/x86_64/crypto/bn/rsaz-x86_64.s
+        ../asm/android/x86_64/crypto/bn/x86_64-mont.s
+        ../asm/android/x86_64/crypto/bn/x86_64-gf2m.s
+        ../asm/android/x86_64/crypto/aes/aesni-sha256-x86_64.s
+        ../asm/android/x86_64/crypto/aes/aesni-mb-x86_64.s
+        ../asm/android/x86_64/crypto/aes/aesni-x86_64.s
+        ../asm/android/x86_64/crypto/aes/vpaes-x86_64.s
+        ../asm/android/x86_64/crypto/aes/aesni-sha1-x86_64.s
+        ../asm/android/x86_64/crypto/sha/sha256-x86_64.s
+        ../asm/android/x86_64/crypto/sha/sha1-mb-x86_64.s
+        ../asm/android/x86_64/crypto/sha/sha1-x86_64.s
+        ../asm/android/x86_64/crypto/sha/sha256-mb-x86_64.s
+        ../asm/android/x86_64/crypto/sha/sha512-x86_64.s
+        ../asm/android/x86_64/crypto/sha/keccak1600-x86_64.s
+        ../asm/android/x86_64/crypto/chacha/chacha-x86_64.s
+        ../asm/android/x86_64/crypto/modes/ghash-x86_64.s
+        ../asm/android/x86_64/crypto/modes/aesni-gcm-x86_64.s
+        bn/asm/x86_64-gcc.c
+        bn/rsaz_exp.c
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+    )
+ENDIF()
+
+IF (OS_ANDROID AND ARCH_I686)
+    CFLAGS(
+        -DOPENSSL_PIC
+        -DOPENSSL_BN_ASM_PART_WORDS
+        -DOPENSSL_IA32_SSE2
+        -DOPENSSL_BN_ASM_GF2m
+        -DRC4_ASM
+        -DMD5_ASM
+        -DRMD160_ASM
+        -DWHIRLPOOL_ASM
+        -DGHASH_ASM
+    )
+    SRCS(
+        ../asm/android/i686/crypto/ec/ecp_nistz256-x86.s
+        ../asm/android/i686/crypto/bf/bf-586.s
+        ../asm/android/i686/crypto/md5/md5-586.s
+        ../asm/android/i686/crypto/rc4/rc4-586.s
+        ../asm/android/i686/crypto/whrlpool/wp-mmx.s
+        ../asm/android/i686/crypto/x86cpuid.s
+        ../asm/android/i686/crypto/des/crypt586.s
+        ../asm/android/i686/crypto/des/des-586.s
+        ../asm/android/i686/crypto/poly1305/poly1305-x86.s
+        ../asm/android/i686/crypto/ripemd/rmd-586.s
+        ../asm/android/i686/crypto/camellia/cmll-x86.s
+        ../asm/android/i686/crypto/bn/bn-586.s
+        ../asm/android/i686/crypto/bn/co-586.s
+        ../asm/android/i686/crypto/bn/x86-gf2m.s
+        ../asm/android/i686/crypto/bn/x86-mont.s
+        ../asm/android/i686/crypto/aes/aesni-x86.s
+        ../asm/android/i686/crypto/aes/vpaes-x86.s
+        ../asm/android/i686/crypto/sha/sha512-586.s
+        ../asm/android/i686/crypto/sha/sha256-586.s
+        ../asm/android/i686/crypto/sha/sha1-586.s
+        ../asm/android/i686/crypto/chacha/chacha-x86.s
+        ../asm/android/i686/crypto/modes/ghash-x86.s
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        sha/keccak1600.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
+IF (OS_ANDROID AND ARCH_ARM7)
     IF (CLANG)
         # XXX: This is a workarond for 'out of range immediate fixup value'
         # error with clang integrated assembler:
         # https://github.com/openssl/openssl/issues/7878
-        CFLAGS( 
-            -mno-thumb 
-        ) 
+        CFLAGS(
+            -mno-thumb
+        )
     ENDIF()
-    CFLAGS( 
-        -DOPENSSL_PIC 
-        -DOPENSSL_BN_ASM_GF2m 
-        -DAES_ASM 
-        -DBSAES_ASM 
-        -DGHASH_ASM 
-    ) 
-    SRCS( 
-        ../asm/android/arm/crypto/ec/ecp_nistz256-armv4.S 
-        ../asm/android/arm/crypto/poly1305/poly1305-armv4.S 
-        ../asm/android/arm/crypto/armv4cpuid.S 
-        ../asm/android/arm/crypto/bn/armv4-mont.S 
-        ../asm/android/arm/crypto/bn/armv4-gf2m.S 
-        ../asm/android/arm/crypto/aes/aes-armv4.S 
-        ../asm/android/arm/crypto/aes/bsaes-armv7.S 
-        ../asm/android/arm/crypto/aes/aesv8-armx.S 
-        ../asm/android/arm/crypto/sha/keccak1600-armv4.S 
-        ../asm/android/arm/crypto/sha/sha256-armv4.S 
-        ../asm/android/arm/crypto/sha/sha512-armv4.S 
-        ../asm/android/arm/crypto/sha/sha1-armv4-large.S 
-        ../asm/android/arm/crypto/chacha/chacha-armv4.S 
-        ../asm/android/arm/crypto/modes/ghashv8-armx.S 
-        ../asm/android/arm/crypto/modes/ghash-armv4.S 
-        armcap.c 
-        bn/bn_asm.c 
-        camellia/camellia.c 
-        camellia/cmll_cbc.c 
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        rc4/rc4_enc.c 
-        rc4/rc4_skey.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
-IF (OS_ANDROID AND ARCH_ARM64) 
-    CFLAGS( 
-        -DOPENSSL_PIC 
-    ) 
-    SRCS( 
-        ../asm/android/arm64/crypto/ec/ecp_nistz256-armv8.S 
-        ../asm/android/arm64/crypto/poly1305/poly1305-armv8.S 
-        ../asm/android/arm64/crypto/bn/armv8-mont.S 
-        ../asm/android/arm64/crypto/aes/vpaes-armv8.S 
-        ../asm/android/arm64/crypto/aes/aesv8-armx.S 
-        ../asm/android/arm64/crypto/sha/sha512-armv8.S 
-        ../asm/android/arm64/crypto/sha/keccak1600-armv8.S 
-        ../asm/android/arm64/crypto/sha/sha1-armv8.S 
-        ../asm/android/arm64/crypto/sha/sha256-armv8.S 
-        ../asm/android/arm64/crypto/arm64cpuid.S 
-        ../asm/android/arm64/crypto/chacha/chacha-armv8.S 
-        ../asm/android/arm64/crypto/modes/ghashv8-armx.S 
-        armcap.c 
-        bn/bn_asm.c 
-        camellia/camellia.c 
+    CFLAGS(
+        -DOPENSSL_PIC
+        -DOPENSSL_BN_ASM_GF2m
+        -DAES_ASM
+        -DBSAES_ASM
+        -DGHASH_ASM
+    )
+    SRCS(
+        ../asm/android/arm/crypto/ec/ecp_nistz256-armv4.S
+        ../asm/android/arm/crypto/poly1305/poly1305-armv4.S
+        ../asm/android/arm/crypto/armv4cpuid.S
+        ../asm/android/arm/crypto/bn/armv4-mont.S
+        ../asm/android/arm/crypto/bn/armv4-gf2m.S
+        ../asm/android/arm/crypto/aes/aes-armv4.S
+        ../asm/android/arm/crypto/aes/bsaes-armv7.S
+        ../asm/android/arm/crypto/aes/aesv8-armx.S
+        ../asm/android/arm/crypto/sha/keccak1600-armv4.S
+        ../asm/android/arm/crypto/sha/sha256-armv4.S
+        ../asm/android/arm/crypto/sha/sha512-armv4.S
+        ../asm/android/arm/crypto/sha/sha1-armv4-large.S
+        ../asm/android/arm/crypto/chacha/chacha-armv4.S
+        ../asm/android/arm/crypto/modes/ghashv8-armx.S
+        ../asm/android/arm/crypto/modes/ghash-armv4.S
+        armcap.c
+        bn/bn_asm.c
+        camellia/camellia.c
+        camellia/cmll_cbc.c
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        rc4/rc4_enc.c
+        rc4/rc4_skey.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
+IF (OS_ANDROID AND ARCH_ARM64)
+    CFLAGS(
+        -DOPENSSL_PIC
+    )
+    SRCS(
+        ../asm/android/arm64/crypto/ec/ecp_nistz256-armv8.S
+        ../asm/android/arm64/crypto/poly1305/poly1305-armv8.S
+        ../asm/android/arm64/crypto/bn/armv8-mont.S
+        ../asm/android/arm64/crypto/aes/vpaes-armv8.S
+        ../asm/android/arm64/crypto/aes/aesv8-armx.S
+        ../asm/android/arm64/crypto/sha/sha512-armv8.S
+        ../asm/android/arm64/crypto/sha/keccak1600-armv8.S
+        ../asm/android/arm64/crypto/sha/sha1-armv8.S
+        ../asm/android/arm64/crypto/sha/sha256-armv8.S
+        ../asm/android/arm64/crypto/arm64cpuid.S
+        ../asm/android/arm64/crypto/chacha/chacha-armv8.S
+        ../asm/android/arm64/crypto/modes/ghashv8-armx.S
+        armcap.c
+        bn/bn_asm.c
+        camellia/camellia.c
         camellia/cmll_cbc.c
-        dso/dso_dlfcn.c 
-        rand/rand_vms.c 
-        rc4/rc4_enc.c 
-        rc4/rc4_skey.c 
-        whrlpool/wp_block.c 
-    ) 
-ENDIF() 
- 
+        dso/dso_dlfcn.c
+        rand/rand_vms.c
+        rc4/rc4_enc.c
+        rc4/rc4_skey.c
+        whrlpool/wp_block.c
+    )
+ENDIF()
+
 END()