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

Unified Diff: openssl.gypi

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 | « no previous file | openssl/Crypto-config.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl.gypi
diff --git a/openssl.gypi b/openssl.gypi
index 8e01cd027d3d717747662981863a4f1c96da88f1..9b0069c56407c4dfe8846e60a212f1c74fd84fe3 100644
--- a/openssl.gypi
+++ b/openssl.gypi
@@ -154,6 +154,7 @@
'openssl/crypto/buffer/buf_err.c',
'openssl/crypto/buffer/buf_str.c',
'openssl/crypto/buffer/buffer.c',
+ 'openssl/crypto/chacha/chacha_enc.c',
'openssl/crypto/cmac/cm_ameth.c',
'openssl/crypto/cmac/cm_pmeth.c',
'openssl/crypto/cmac/cmac.c',
@@ -287,6 +288,7 @@
'openssl/crypto/evp/e_aes.c',
'openssl/crypto/evp/e_aes_cbc_hmac_sha1.c',
'openssl/crypto/evp/e_bf.c',
+ 'openssl/crypto/evp/e_chacha20poly1305.c',
'openssl/crypto/evp/e_des.c',
'openssl/crypto/evp/e_des3.c',
'openssl/crypto/evp/e_null.c',
@@ -298,6 +300,7 @@
'openssl/crypto/evp/e_xcbc_d.c',
'openssl/crypto/evp/encode.c',
'openssl/crypto/evp/evp_acnf.c',
+ 'openssl/crypto/evp/evp_aead.c',
'openssl/crypto/evp/evp_cnf.c',
'openssl/crypto/evp/evp_enc.c',
'openssl/crypto/evp/evp_err.c',
@@ -396,6 +399,7 @@
'openssl/crypto/pkcs7/pk7_smime.c',
'openssl/crypto/pkcs7/pkcs7err.c',
'openssl/crypto/pqueue/pqueue.c',
+ 'openssl/crypto/poly1305/poly1305.c',
'openssl/crypto/rand/md_rand.c',
'openssl/crypto/rand/rand_egd.c',
'openssl/crypto/rand/rand_err.c',
@@ -562,7 +566,10 @@
'openssl/crypto/aes/asm/aes-armv4.S',
'openssl/crypto/bn/asm/armv4-gf2m.S',
'openssl/crypto/bn/asm/armv4-mont.S',
+ 'openssl/crypto/chacha/chacha_vec_arm.s',
'openssl/crypto/modes/asm/ghash-armv4.S',
+ 'openssl/crypto/poly1305/poly1305_arm.c',
+ 'openssl/crypto/poly1305/poly1305_arm_asm.s',
'openssl/crypto/sha/asm/sha1-armv4-large.S',
'openssl/crypto/sha/asm/sha256-armv4.S',
'openssl/crypto/sha/asm/sha512-armv4.S',
@@ -598,9 +605,11 @@
'openssl/crypto/aes/aes_cbc.c',
'openssl/crypto/bf/bf_enc.c',
'openssl/crypto/bn/bn_asm.c',
+ 'openssl/crypto/chacha/chacha_enc.c',
'openssl/crypto/des/des_enc.c',
'openssl/crypto/des/fcrypt_b.c',
'openssl/crypto/mem_clr.c',
+ 'openssl/crypto/poly1305/poly1305.c',
],
'openssl_x86_sources': [
'openssl/crypto/aes/asm/aes-586.S',
@@ -611,10 +620,12 @@
'openssl/crypto/bn/asm/co-586.S',
'openssl/crypto/bn/asm/x86-gf2m.S',
'openssl/crypto/bn/asm/x86-mont.S',
+ 'openssl/crypto/chacha/chacha_vec.c',
'openssl/crypto/des/asm/crypt586.S',
'openssl/crypto/des/asm/des-586.S',
'openssl/crypto/md5/asm/md5-586.S',
'openssl/crypto/modes/asm/ghash-x86.S',
+ 'openssl/crypto/poly1305/poly1305_vec.c',
'openssl/crypto/sha/asm/sha1-586.S',
'openssl/crypto/sha/asm/sha256-586.S',
'openssl/crypto/sha/asm/sha512-586.S',
@@ -639,7 +650,9 @@
'openssl/crypto/aes/aes_cbc.c',
'openssl/crypto/aes/aes_core.c',
'openssl/crypto/bn/bn_asm.c',
+ 'openssl/crypto/chacha/chacha_enc.c',
'openssl/crypto/mem_clr.c',
+ 'openssl/crypto/poly1305/poly1305.c',
'openssl/crypto/rc4/rc4_enc.c',
'openssl/crypto/rc4/rc4_skey.c',
],
@@ -654,6 +667,7 @@
'openssl/crypto/bn/asm/x86_64-gf2m.S',
'openssl/crypto/bn/asm/x86_64-mont.S',
'openssl/crypto/bn/asm/x86_64-mont5.S',
+ 'openssl/crypto/chacha/chacha_vec.c',
'openssl/crypto/md5/asm/md5-x86_64.S',
'openssl/crypto/modes/asm/ghash-x86_64.S',
'openssl/crypto/rc4/asm/rc4-md5-x86_64.S',
@@ -661,6 +675,7 @@
'openssl/crypto/sha/asm/sha1-x86_64.S',
'openssl/crypto/sha/asm/sha256-x86_64.S',
'openssl/crypto/sha/asm/sha512-x86_64.S',
+ 'openssl/crypto/poly1305/poly1305_vec.c',
'openssl/crypto/x86_64cpuid.S',
],
'openssl_x86_64_defines': [
« no previous file with comments | « no previous file | openssl/Crypto-config.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698