Index: third_party/boringssl/boringssl.gypi |
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi |
index 530dbf7d00e627f38ac7e7c9aa0c20eacc30417a..fb8e64396a7f9f22e50ce18474a561f886a839a9 100644 |
--- a/third_party/boringssl/boringssl.gypi |
+++ b/third_party/boringssl/boringssl.gypi |
@@ -7,7 +7,6 @@ |
{ |
'variables': { |
'boringssl_ssl_sources': [ |
- 'src/ssl/custom_extensions.c', |
'src/ssl/d1_both.c', |
'src/ssl/d1_clnt.c', |
'src/ssl/d1_lib.c', |
@@ -15,7 +14,6 @@ |
'src/ssl/d1_pkt.c', |
'src/ssl/d1_srtp.c', |
'src/ssl/d1_srvr.c', |
- 'src/ssl/dtls_record.c', |
'src/ssl/pqueue/pqueue.c', |
'src/ssl/s3_both.c', |
'src/ssl/s3_clnt.c', |
@@ -25,19 +23,18 @@ |
'src/ssl/s3_pkt.c', |
'src/ssl/s3_srvr.c', |
'src/ssl/ssl_aead_ctx.c', |
+ 'src/ssl/ssl_algs.c', |
'src/ssl/ssl_asn1.c', |
- 'src/ssl/ssl_buffer.c', |
'src/ssl/ssl_cert.c', |
'src/ssl/ssl_cipher.c', |
- 'src/ssl/ssl_ecdh.c', |
- 'src/ssl/ssl_file.c', |
'src/ssl/ssl_lib.c', |
'src/ssl/ssl_rsa.c', |
- 'src/ssl/ssl_session.c', |
+ 'src/ssl/ssl_sess.c', |
'src/ssl/ssl_stat.c', |
+ 'src/ssl/ssl_txt.c', |
'src/ssl/t1_enc.c', |
'src/ssl/t1_lib.c', |
- 'src/ssl/tls_record.c', |
+ 'src/ssl/t1_reneg.c', |
], |
'boringssl_crypto_sources': [ |
'err_data.c', |
@@ -95,7 +92,6 @@ |
'src/crypto/bn/add.c', |
'src/crypto/bn/asm/x86_64-gcc.c', |
'src/crypto/bn/bn.c', |
- 'src/crypto/bn/bn_asn1.c', |
'src/crypto/bn/cmp.c', |
'src/crypto/bn/convert.c', |
'src/crypto/bn/ctx.c', |
@@ -112,7 +108,6 @@ |
'src/crypto/bn/shift.c', |
'src/crypto/bn/sqrt.c', |
'src/crypto/buf/buf.c', |
- 'src/crypto/bytestring/asn1_compat.c', |
'src/crypto/bytestring/ber.c', |
'src/crypto/bytestring/cbb.c', |
'src/crypto/bytestring/cbs.c', |
@@ -135,12 +130,11 @@ |
'src/crypto/cpu-arm.c', |
'src/crypto/cpu-intel.c', |
'src/crypto/crypto.c', |
- 'src/crypto/curve25519/curve25519.c', |
- 'src/crypto/curve25519/x25519-x86_64.c', |
'src/crypto/des/des.c', |
'src/crypto/dh/check.c', |
'src/crypto/dh/dh.c', |
'src/crypto/dh/dh_asn1.c', |
+ 'src/crypto/dh/dh_impl.c', |
'src/crypto/dh/params.c', |
'src/crypto/digest/digest.c', |
'src/crypto/digest/digests.c', |
@@ -148,14 +142,13 @@ |
'src/crypto/directory_win.c', |
'src/crypto/dsa/dsa.c', |
'src/crypto/dsa/dsa_asn1.c', |
+ 'src/crypto/dsa/dsa_impl.c', |
'src/crypto/ec/ec.c', |
'src/crypto/ec/ec_asn1.c', |
'src/crypto/ec/ec_key.c', |
'src/crypto/ec/ec_montgomery.c', |
'src/crypto/ec/oct.c', |
- 'src/crypto/ec/p224-64.c', |
'src/crypto/ec/p256-64.c', |
- 'src/crypto/ec/p256-x86_64.c', |
'src/crypto/ec/simple.c', |
'src/crypto/ec/util-64.c', |
'src/crypto/ec/wnaf.c', |
@@ -165,9 +158,9 @@ |
'src/crypto/engine/engine.c', |
'src/crypto/err/err.c', |
'src/crypto/evp/algorithm.c', |
+ 'src/crypto/evp/asn1.c', |
'src/crypto/evp/digestsign.c', |
'src/crypto/evp/evp.c', |
- 'src/crypto/evp/evp_asn1.c', |
'src/crypto/evp/evp_ctx.c', |
'src/crypto/evp/p_dsa_asn1.c', |
'src/crypto/evp/p_ec.c', |
@@ -205,6 +198,7 @@ |
'src/crypto/poly1305/poly1305.c', |
'src/crypto/poly1305/poly1305_arm.c', |
'src/crypto/poly1305/poly1305_vec.c', |
+ 'src/crypto/rand/hwrand.c', |
'src/crypto/rand/rand.c', |
'src/crypto/rand/urandom.c', |
'src/crypto/rand/windows.c', |
@@ -309,7 +303,6 @@ |
], |
'boringssl_linux_aarch64_sources': [ |
'linux-aarch64/crypto/aes/aesv8-armx64.S', |
- 'linux-aarch64/crypto/bn/armv8-mont.S', |
'linux-aarch64/crypto/modes/ghashv8-armx64.S', |
'linux-aarch64/crypto/sha/sha1-armv8.S', |
'linux-aarch64/crypto/sha/sha256-armv8.S', |
@@ -327,7 +320,6 @@ |
'linux-arm/crypto/sha/sha512-armv4.S', |
'src/crypto/chacha/chacha_vec_arm.S', |
'src/crypto/cpu-arm-asm.S', |
- 'src/crypto/curve25519/asm/x25519-asm-arm.S', |
'src/crypto/poly1305/poly1305_arm_asm.S', |
], |
'boringssl_linux_x86_sources': [ |
@@ -337,6 +329,7 @@ |
'linux-x86/crypto/bn/bn-586.S', |
'linux-x86/crypto/bn/co-586.S', |
'linux-x86/crypto/bn/x86-mont.S', |
+ 'linux-x86/crypto/cpu-x86-asm.S', |
'linux-x86/crypto/md5/md5-586.S', |
'linux-x86/crypto/modes/ghash-x86.S', |
'linux-x86/crypto/rc4/rc4-586.S', |
@@ -353,16 +346,16 @@ |
'linux-x86_64/crypto/bn/rsaz-x86_64.S', |
'linux-x86_64/crypto/bn/x86_64-mont.S', |
'linux-x86_64/crypto/bn/x86_64-mont5.S', |
- 'linux-x86_64/crypto/ec/p256-x86_64-asm.S', |
+ 'linux-x86_64/crypto/cpu-x86_64-asm.S', |
'linux-x86_64/crypto/md5/md5-x86_64.S', |
'linux-x86_64/crypto/modes/aesni-gcm-x86_64.S', |
'linux-x86_64/crypto/modes/ghash-x86_64.S', |
'linux-x86_64/crypto/rand/rdrand-x86_64.S', |
+ 'linux-x86_64/crypto/rc4/rc4-md5-x86_64.S', |
'linux-x86_64/crypto/rc4/rc4-x86_64.S', |
'linux-x86_64/crypto/sha/sha1-x86_64.S', |
'linux-x86_64/crypto/sha/sha256-x86_64.S', |
'linux-x86_64/crypto/sha/sha512-x86_64.S', |
- 'src/crypto/curve25519/asm/x25519-asm-x86_64.S', |
], |
'boringssl_mac_x86_sources': [ |
'mac-x86/crypto/aes/aes-586.S', |
@@ -371,6 +364,7 @@ |
'mac-x86/crypto/bn/bn-586.S', |
'mac-x86/crypto/bn/co-586.S', |
'mac-x86/crypto/bn/x86-mont.S', |
+ 'mac-x86/crypto/cpu-x86-asm.S', |
'mac-x86/crypto/md5/md5-586.S', |
'mac-x86/crypto/modes/ghash-x86.S', |
'mac-x86/crypto/rc4/rc4-586.S', |
@@ -387,11 +381,12 @@ |
'mac-x86_64/crypto/bn/rsaz-x86_64.S', |
'mac-x86_64/crypto/bn/x86_64-mont.S', |
'mac-x86_64/crypto/bn/x86_64-mont5.S', |
- 'mac-x86_64/crypto/ec/p256-x86_64-asm.S', |
+ 'mac-x86_64/crypto/cpu-x86_64-asm.S', |
'mac-x86_64/crypto/md5/md5-x86_64.S', |
'mac-x86_64/crypto/modes/aesni-gcm-x86_64.S', |
'mac-x86_64/crypto/modes/ghash-x86_64.S', |
'mac-x86_64/crypto/rand/rdrand-x86_64.S', |
+ 'mac-x86_64/crypto/rc4/rc4-md5-x86_64.S', |
'mac-x86_64/crypto/rc4/rc4-x86_64.S', |
'mac-x86_64/crypto/sha/sha1-x86_64.S', |
'mac-x86_64/crypto/sha/sha256-x86_64.S', |
@@ -404,6 +399,7 @@ |
'win-x86/crypto/bn/bn-586.asm', |
'win-x86/crypto/bn/co-586.asm', |
'win-x86/crypto/bn/x86-mont.asm', |
+ 'win-x86/crypto/cpu-x86-asm.asm', |
'win-x86/crypto/md5/md5-586.asm', |
'win-x86/crypto/modes/ghash-x86.asm', |
'win-x86/crypto/rc4/rc4-586.asm', |
@@ -420,11 +416,12 @@ |
'win-x86_64/crypto/bn/rsaz-x86_64.asm', |
'win-x86_64/crypto/bn/x86_64-mont.asm', |
'win-x86_64/crypto/bn/x86_64-mont5.asm', |
- 'win-x86_64/crypto/ec/p256-x86_64-asm.asm', |
+ 'win-x86_64/crypto/cpu-x86_64-asm.asm', |
'win-x86_64/crypto/md5/md5-x86_64.asm', |
'win-x86_64/crypto/modes/aesni-gcm-x86_64.asm', |
'win-x86_64/crypto/modes/ghash-x86_64.asm', |
'win-x86_64/crypto/rand/rdrand-x86_64.asm', |
+ 'win-x86_64/crypto/rc4/rc4-md5-x86_64.asm', |
'win-x86_64/crypto/rc4/rc4-x86_64.asm', |
'win-x86_64/crypto/sha/sha1-x86_64.asm', |
'win-x86_64/crypto/sha/sha256-x86_64.asm', |