third_party/openssl: add ChaCha20+Poly1305 support.

openssl/Crypto-config.mk

 # Auto-generated - DO NOT EDIT!
 # To regenerate, edit openssl.config, then run:
 #     ./import_openssl.sh import /path/to/openssl-1.0.1e.tar.gz
 #
 # Before including this file, the local Android.mk must define the following
 # variables:
 #
 #    local_c_flags
 #    local_c_includes
 #    local_additional_dependencies
@@ skipping 150 matching lines @@
   crypto/bn/bn_print.c \
   crypto/bn/bn_rand.c \
   crypto/bn/bn_recp.c \
   crypto/bn/bn_shift.c \
   crypto/bn/bn_sqr.c \
   crypto/bn/bn_sqrt.c \
   crypto/bn/bn_word.c \
   crypto/buffer/buf_err.c \
   crypto/buffer/buf_str.c \
   crypto/buffer/buffer.c \
+  crypto/chacha/chacha_enc.c \
   crypto/cmac/cm_ameth.c \
   crypto/cmac/cm_pmeth.c \
   crypto/cmac/cmac.c \
   crypto/comp/c_rle.c \
   crypto/comp/c_zlib.c \
   crypto/comp/comp_err.c \
   crypto/comp/comp_lib.c \
   crypto/conf/conf_api.c \
   crypto/conf/conf_def.c \
   crypto/conf/conf_err.c \
@@ skipping 117 matching lines @@
   crypto/evp/bio_enc.c \
   crypto/evp/bio_md.c \
   crypto/evp/bio_ok.c \
   crypto/evp/c_all.c \
   crypto/evp/c_allc.c \
   crypto/evp/c_alld.c \
   crypto/evp/digest.c \
   crypto/evp/e_aes.c \
   crypto/evp/e_aes_cbc_hmac_sha1.c \
   crypto/evp/e_bf.c \
+  crypto/evp/e_chacha20poly1305.c \
   crypto/evp/e_des.c \
   crypto/evp/e_des3.c \
   crypto/evp/e_null.c \
   crypto/evp/e_old.c \
   crypto/evp/e_rc2.c \
   crypto/evp/e_rc4.c \
   crypto/evp/e_rc4_hmac_md5.c \
   crypto/evp/e_rc5.c \
   crypto/evp/e_xcbc_d.c \
   crypto/evp/encode.c \
   crypto/evp/evp_acnf.c \
+  crypto/evp/evp_aead.c \
   crypto/evp/evp_cnf.c \
   crypto/evp/evp_enc.c \
   crypto/evp/evp_err.c \
   crypto/evp/evp_key.c \
   crypto/evp/evp_lib.c \
   crypto/evp/evp_pbe.c \
   crypto/evp/evp_pkey.c \
   crypto/evp/m_dss.c \
   crypto/evp/m_dss1.c \
   crypto/evp/m_ecdsa.c \
@@ skipping 84 matching lines @@
   crypto/pkcs12/p12_p8e.c \
   crypto/pkcs12/p12_utl.c \
   crypto/pkcs12/pk12err.c \
   crypto/pkcs7/pk7_asn1.c \
   crypto/pkcs7/pk7_attr.c \
   crypto/pkcs7/pk7_doit.c \
   crypto/pkcs7/pk7_lib.c \
   crypto/pkcs7/pk7_mime.c \
   crypto/pkcs7/pk7_smime.c \
   crypto/pkcs7/pkcs7err.c \
+  crypto/poly1305/poly1305.c \
   crypto/pqueue/pqueue.c \
   crypto/rand/md_rand.c \
   crypto/rand/rand_egd.c \
   crypto/rand/rand_err.c \
   crypto/rand/rand_lib.c \
   crypto/rand/rand_unix.c \
   crypto/rand/rand_win.c \
   crypto/rand/randfile.c \
   crypto/rc2/rc2_cbc.c \
   crypto/rc2/rc2_ecb.c \
@@ skipping 114 matching lines @@
   -DOPENSSL_BN_ASM_GF2m \
   -DOPENSSL_BN_ASM_MONT \
   -DSHA1_ASM \
   -DSHA256_ASM \
   -DSHA512_ASM \
 
 arm_src_files := \
   crypto/aes/asm/aes-armv4.S \
   crypto/bn/asm/armv4-gf2m.S \
   crypto/bn/asm/armv4-mont.S \
+  crypto/chacha/chacha_vec_arm.s \
   crypto/modes/asm/ghash-armv4.S \
+  crypto/poly1305/poly1305_arm.c \
+  crypto/poly1305/poly1305_arm_asm.s \
   crypto/sha/asm/sha1-armv4-large.S \
   crypto/sha/asm/sha256-armv4.S \
   crypto/sha/asm/sha512-armv4.S \
 
 arm_exclude_files := \
   crypto/aes/aes_core.c \
 
 x86_c_flags := \
   -DAES_ASM \
   -DDES_PTR \
@@ skipping 11 matching lines @@
 
 x86_src_files := \
   crypto/aes/asm/aes-586.S \
   crypto/aes/asm/aesni-x86.S \
   crypto/aes/asm/vpaes-x86.S \
   crypto/bf/asm/bf-586.S \
   crypto/bn/asm/bn-586.S \
   crypto/bn/asm/co-586.S \
   crypto/bn/asm/x86-gf2m.S \
   crypto/bn/asm/x86-mont.S \
+  crypto/chacha/chacha_vec.c \
   crypto/des/asm/crypt586.S \
   crypto/des/asm/des-586.S \
   crypto/md5/asm/md5-586.S \
   crypto/modes/asm/ghash-x86.S \
+  crypto/poly1305/poly1305_vec.c \
   crypto/sha/asm/sha1-586.S \
   crypto/sha/asm/sha256-586.S \
   crypto/sha/asm/sha512-586.S \
   crypto/x86cpuid.S \
 
 x86_exclude_files := \
   crypto/aes/aes_cbc.c \
   crypto/aes/aes_core.c \
   crypto/bf/bf_enc.c \
   crypto/bn/bn_asm.c \
+  crypto/chacha/chacha_enc.c \
   crypto/des/des_enc.c \
   crypto/des/fcrypt_b.c \
   crypto/mem_clr.c \
+  crypto/poly1305/poly1305.c \
 
 x86_64_c_flags := \
   -DAES_ASM \
   -DDES_PTR \
   -DDES_RISC1 \
   -DDES_UNROLL \
   -DGHASH_ASM \
   -DMD5_ASM \
   -DOPENSSL_BN_ASM_GF2m \
   -DOPENSSL_BN_ASM_MONT \
   -DOPENSSL_CPUID_OBJ \
   -DSHA1_ASM \
   -DSHA256_ASM \
   -DSHA512_ASM \
 
 x86_64_src_files := \
   crypto/aes/asm/aes-x86_64.S \
   crypto/aes/asm/aesni-sha1-x86_64.S \
   crypto/aes/asm/aesni-x86_64.S \
   crypto/aes/asm/bsaes-x86_64.S \
   crypto/aes/asm/vpaes-x86_64.S \
   crypto/bn/asm/modexp512-x86_64.S \
   crypto/bn/asm/x86_64-gcc.c \
   crypto/bn/asm/x86_64-gf2m.S \
   crypto/bn/asm/x86_64-mont.S \
   crypto/bn/asm/x86_64-mont5.S \
+  crypto/chacha/chacha_vec.c \
   crypto/md5/asm/md5-x86_64.S \
   crypto/modes/asm/ghash-x86_64.S \
+  crypto/poly1305/poly1305_vec.c \
   crypto/rc4/asm/rc4-md5-x86_64.S \
   crypto/rc4/asm/rc4-x86_64.S \
   crypto/sha/asm/sha1-x86_64.S \
   crypto/sha/asm/sha256-x86_64.S \
   crypto/sha/asm/sha512-x86_64.S \
   crypto/x86_64cpuid.S \
 
 x86_64_exclude_files := \
   crypto/aes/aes_cbc.c \
   crypto/aes/aes_core.c \
   crypto/bn/bn_asm.c \
+  crypto/chacha/chacha_enc.c \
   crypto/mem_clr.c \
+  crypto/poly1305/poly1305.c \
   crypto/rc4/rc4_enc.c \
   crypto/rc4/rc4_skey.c \
 
 mips_c_flags := \
   -DAES_ASM \
   -DOPENSSL_BN_ASM_MONT \
   -DSHA1_ASM \
   -DSHA256_ASM \
 
 mips_src_files := \
@@ skipping 23 matching lines @@
 host_arch := unknown_arch
 endif
 
 host_c_flags    := $(common_c_flags) $($(host_arch)_c_flags) $(local_c_flags)
 host_c_includes := $(addprefix external/openssl/,$(common_c_includes)) $(local_c_includes)
 host_src_files  := $(common_src_files) $($(host_arch)_src_files)
 host_src_files  := $(filter-out $($(host_arch)_exclude_files), $(host_src_files))
 
 local_additional_dependencies += $(LOCAL_PATH)/Crypto-config.mk