diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/Crypto-config-target.mk | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/Crypto-config-target.mk')
| -rw-r--r-- | main/openssl/Crypto-config-target.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/main/openssl/Crypto-config-target.mk b/main/openssl/Crypto-config-target.mk index 6dbf1bd3..2c5b01e5 100644 --- a/main/openssl/Crypto-config-target.mk +++ b/main/openssl/Crypto-config-target.mk @@ -545,15 +545,20 @@ common_c_includes := \ arm_cflags := \ -DAES_ASM \ + -DBSAES_ASM \ -DGHASH_ASM \ -DOPENSSL_BN_ASM_GF2m \ -DOPENSSL_BN_ASM_MONT \ + -DOPENSSL_CPUID_OBJ \ -DSHA1_ASM \ -DSHA256_ASM \ -DSHA512_ASM \ arm_src_files := \ crypto/aes/asm/aes-armv4.S \ + crypto/aes/asm/bsaes-armv7.S \ + crypto/armcap.c \ + crypto/armv4cpuid.S \ crypto/bn/asm/armv4-gf2m.S \ crypto/bn/asm/armv4-mont.S \ crypto/modes/asm/ghash-armv4.S \ @@ -563,6 +568,7 @@ arm_src_files := \ arm_exclude_files := \ crypto/aes/aes_core.c \ + crypto/mem_clr.c \ arm64_cflags := \ -DOPENSSL_NO_ASM \ @@ -582,9 +588,11 @@ x86_cflags := \ -DOPENSSL_BN_ASM_MONT \ -DOPENSSL_BN_ASM_PART_WORDS \ -DOPENSSL_CPUID_OBJ \ + -DOPENSSL_IA32_SSE2 \ -DSHA1_ASM \ -DSHA256_ASM \ -DSHA512_ASM \ + -DVPAES_ASM \ x86_src_files := \ crypto/aes/asm/aes-586.S \ @@ -615,6 +623,7 @@ x86_exclude_files := \ x86_64_cflags := \ -DAES_ASM \ + -DBSAES_ASM \ -DDES_PTR \ -DDES_RISC1 \ -DDES_UNROLL \ @@ -622,10 +631,12 @@ x86_64_cflags := \ -DMD5_ASM \ -DOPENSSL_BN_ASM_GF2m \ -DOPENSSL_BN_ASM_MONT \ + -DOPENSSL_BN_ASM_MONT5 \ -DOPENSSL_CPUID_OBJ \ -DSHA1_ASM \ -DSHA256_ASM \ -DSHA512_ASM \ + -DVPAES_ASM \ x86_64_src_files := \ crypto/aes/asm/aes-x86_64.S \ |