diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
| commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
| tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /app/openssl/openssl.config | |
| parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
| parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) | |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'app/openssl/openssl.config')
| -rw-r--r-- | app/openssl/openssl.config | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/openssl/openssl.config b/app/openssl/openssl.config index 867711fe..9edd51e2 100644 --- a/app/openssl/openssl.config +++ b/app/openssl/openssl.config @@ -128,6 +128,7 @@ crypto/cmac/Makefile \ crypto/cms/Makefile \ crypto/comp/Makefile \ crypto/conf/Makefile \ +crypto/constant_time_test.c \ crypto/crypto-lib.com \ crypto/des/Makefile \ crypto/des/des-lib.com \ @@ -220,6 +221,7 @@ ssl/heartbeat_test.c \ ssl/install-ssl.com \ ssl/ssl-lib.com \ ssl/ssl_task.c \ +ssl/ssl_utst.c \ " NEEDED_SOURCES="\ @@ -237,6 +239,10 @@ OPENSSL_CRYPTO_DEFINES="\ NO_WINDOWS_BRAINDEATH \ " +OPENSSL_CRYPTO_CLANG_ASFLAGS_arm="\ +-no-integrated-as \ +" + OPENSSL_CRYPTO_DEFINES_arm="\ AES_ASM \ BSAES_ASM \ @@ -250,6 +256,10 @@ SHA256_ASM \ SHA512_ASM \ " +OPENSSL_CRYPTO_CLANG_ASFLAGS_arm64="\ +-no-integrated-as \ +" + OPENSSL_CRYPTO_DEFINES_arm64="\ DES_UNROLL \ OPENSSL_CPUID_OBJ \ @@ -491,6 +501,7 @@ crypto/conf/conf_lib.c \ crypto/conf/conf_mall.c \ crypto/conf/conf_mod.c \ crypto/conf/conf_sap.c \ +crypto/constant_time_locl.h \ crypto/des/cbc_cksm.c \ crypto/des/cbc_enc.c \ crypto/des/cfb64ede.c \ |