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/openssl.config | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/openssl.config')
| -rw-r--r-- | main/openssl/openssl.config | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/main/openssl/openssl.config b/main/openssl/openssl.config index 82481076..8e97e9c0 100644 --- a/main/openssl/openssl.config +++ b/main/openssl/openssl.config @@ -107,7 +107,6 @@ crypto/Makefile \ crypto/Makefile.save \ crypto/aes/Makefile \ crypto/aes/Makefile.save \ -crypto/armcap.c \ crypto/asn1/Makefile \ crypto/asn1/Makefile.save \ crypto/bf/INSTALL \ @@ -288,8 +287,10 @@ NO_WINDOWS_BRAINDEATH \ OPENSSL_CRYPTO_DEFINES_arm="\ OPENSSL_BN_ASM_GF2m \ OPENSSL_BN_ASM_MONT \ +OPENSSL_CPUID_OBJ \ GHASH_ASM \ AES_ASM \ +BSAES_ASM \ SHA1_ASM \ SHA256_ASM \ SHA512_ASM \ @@ -307,10 +308,12 @@ SHA256_ASM \ " OPENSSL_CRYPTO_DEFINES_x86="\ +OPENSSL_IA32_SSE2 \ OPENSSL_BN_ASM_GF2m \ OPENSSL_BN_ASM_MONT \ OPENSSL_BN_ASM_PART_WORDS \ AES_ASM \ +VPAES_ASM \ GHASH_ASM \ SHA1_ASM \ SHA256_ASM \ @@ -325,7 +328,10 @@ OPENSSL_CPUID_OBJ \ OPENSSL_CRYPTO_DEFINES_x86_64="\ OPENSSL_BN_ASM_GF2m \ OPENSSL_BN_ASM_MONT \ +OPENSSL_BN_ASM_MONT5 \ AES_ASM \ +VPAES_ASM \ +BSAES_ASM \ GHASH_ASM \ SHA1_ASM \ SHA256_ASM \ @@ -867,6 +873,9 @@ crypto/x509v3/v3err.c \ OPENSSL_CRYPTO_SOURCES_arm="\ 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 \ @@ -877,6 +886,7 @@ crypto/sha/asm/sha512-armv4.S \ OPENSSL_CRYPTO_SOURCES_EXCLUDES_arm="\ crypto/aes/aes_core.c \ +crypto/mem_clr.c \ " OPENSSL_CRYPTO_SOURCES_arm64="\ @@ -1083,6 +1093,11 @@ tls12_digests.patch \ alpn.patch \ cbc_record_splitting.patch \ dsa_nonce.patch \ +ecdhe_psk.patch \ +wincrypt.patch \ +tls_psk_hint.patch \ +arm_asm.patch \ +psk_client_callback_128_byte_id_bug.patch \ " source ./openssl.trusty.config |