Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Unified Diff: openssl/Crypto-config.mk

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « openssl.gypi ('k') | openssl/crypto/chacha/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl/Crypto-config.mk
diff --git a/openssl/Crypto-config.mk b/openssl/Crypto-config.mk
index 6c64f18f8ba5a0da9276eb8ed82d88c91f12fba8..fcda886e8d1fd4f9939a5ba315857b0a41a586d2 100644
--- a/openssl/Crypto-config.mk
+++ b/openssl/Crypto-config.mk
@@ -168,6 +168,7 @@ common_src_files := \
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 \
@@ -305,6 +306,7 @@ common_src_files := \
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 \
@@ -316,6 +318,7 @@ common_src_files := \
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 \
@@ -420,6 +423,7 @@ common_src_files := \
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 \
@@ -554,7 +558,10 @@ 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 \
@@ -586,10 +593,12 @@ x86_src_files := \
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 \
@@ -600,9 +609,11 @@ x86_exclude_files := \
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 \
@@ -629,8 +640,10 @@ x86_64_src_files := \
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 \
@@ -642,7 +655,9 @@ 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 \
« no previous file with comments | « openssl.gypi ('k') | openssl/crypto/chacha/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698