| Index: third_party/boringssl/boringssl.gypi
|
| diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi
|
| index fb8e64396a7f9f22e50ce18474a561f886a839a9..2c7e7c763822df2edca8e002d92465fc942b8f67 100644
|
| --- a/third_party/boringssl/boringssl.gypi
|
| +++ b/third_party/boringssl/boringssl.gypi
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| +# Copyright (c) 2016 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| @@ -7,34 +7,34 @@
|
| {
|
| 'variables': {
|
| 'boringssl_ssl_sources': [
|
| + 'src/ssl/custom_extensions.c',
|
| 'src/ssl/d1_both.c',
|
| - 'src/ssl/d1_clnt.c',
|
| 'src/ssl/d1_lib.c',
|
| - 'src/ssl/d1_meth.c',
|
| 'src/ssl/d1_pkt.c',
|
| 'src/ssl/d1_srtp.c',
|
| - 'src/ssl/d1_srvr.c',
|
| - 'src/ssl/pqueue/pqueue.c',
|
| + 'src/ssl/dtls_method.c',
|
| + 'src/ssl/dtls_record.c',
|
| + 'src/ssl/handshake_client.c',
|
| + 'src/ssl/handshake_server.c',
|
| 'src/ssl/s3_both.c',
|
| - 'src/ssl/s3_clnt.c',
|
| 'src/ssl/s3_enc.c',
|
| 'src/ssl/s3_lib.c',
|
| - 'src/ssl/s3_meth.c',
|
| '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_sess.c',
|
| + 'src/ssl/ssl_session.c',
|
| 'src/ssl/ssl_stat.c',
|
| - 'src/ssl/ssl_txt.c',
|
| 'src/ssl/t1_enc.c',
|
| 'src/ssl/t1_lib.c',
|
| - 'src/ssl/t1_reneg.c',
|
| + 'src/ssl/tls_method.c',
|
| + 'src/ssl/tls_record.c',
|
| ],
|
| 'boringssl_crypto_sources': [
|
| 'err_data.c',
|
| @@ -61,18 +61,14 @@
|
| 'src/crypto/asn1/asn1_lib.c',
|
| 'src/crypto/asn1/asn1_par.c',
|
| 'src/crypto/asn1/asn_pack.c',
|
| - 'src/crypto/asn1/bio_asn1.c',
|
| - 'src/crypto/asn1/bio_ndef.c',
|
| 'src/crypto/asn1/f_enum.c',
|
| 'src/crypto/asn1/f_int.c',
|
| 'src/crypto/asn1/f_string.c',
|
| 'src/crypto/asn1/t_bitst.c',
|
| - 'src/crypto/asn1/t_pkey.c',
|
| 'src/crypto/asn1/tasn_dec.c',
|
| 'src/crypto/asn1/tasn_enc.c',
|
| 'src/crypto/asn1/tasn_fre.c',
|
| 'src/crypto/asn1/tasn_new.c',
|
| - 'src/crypto/asn1/tasn_prn.c',
|
| 'src/crypto/asn1/tasn_typ.c',
|
| 'src/crypto/asn1/tasn_utl.c',
|
| 'src/crypto/asn1/x_bignum.c',
|
| @@ -92,6 +88,7 @@
|
| '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',
|
| @@ -108,11 +105,11 @@
|
| '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',
|
| - 'src/crypto/chacha/chacha_generic.c',
|
| - 'src/crypto/chacha/chacha_vec.c',
|
| + 'src/crypto/chacha/chacha.c',
|
| 'src/crypto/cipher/aead.c',
|
| 'src/crypto/cipher/cipher.c',
|
| 'src/crypto/cipher/derive_key.c',
|
| @@ -127,28 +124,31 @@
|
| 'src/crypto/cipher/tls_cbc.c',
|
| 'src/crypto/cmac/cmac.c',
|
| 'src/crypto/conf/conf.c',
|
| + 'src/crypto/cpu-aarch64-linux.c',
|
| + 'src/crypto/cpu-arm-linux.c',
|
| 'src/crypto/cpu-arm.c',
|
| 'src/crypto/cpu-intel.c',
|
| 'src/crypto/crypto.c',
|
| + 'src/crypto/curve25519/curve25519.c',
|
| + 'src/crypto/curve25519/spake25519.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',
|
| - 'src/crypto/directory_posix.c',
|
| - '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',
|
| @@ -157,10 +157,9 @@
|
| 'src/crypto/ecdsa/ecdsa_asn1.c',
|
| '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',
|
| @@ -168,6 +167,7 @@
|
| 'src/crypto/evp/p_rsa.c',
|
| 'src/crypto/evp/p_rsa_asn1.c',
|
| 'src/crypto/evp/pbkdf.c',
|
| + 'src/crypto/evp/print.c',
|
| 'src/crypto/evp/sign.c',
|
| 'src/crypto/ex_data.c',
|
| 'src/crypto/hkdf/hkdf.c',
|
| @@ -181,6 +181,12 @@
|
| 'src/crypto/modes/ctr.c',
|
| 'src/crypto/modes/gcm.c',
|
| 'src/crypto/modes/ofb.c',
|
| + 'src/crypto/newhope/error_correction.c',
|
| + 'src/crypto/newhope/newhope.c',
|
| + 'src/crypto/newhope/ntt.c',
|
| + 'src/crypto/newhope/poly.c',
|
| + 'src/crypto/newhope/precomp.c',
|
| + 'src/crypto/newhope/reduce.c',
|
| 'src/crypto/obj/obj.c',
|
| 'src/crypto/obj/obj_xref.c',
|
| 'src/crypto/pem/pem_all.c',
|
| @@ -198,7 +204,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/deterministic.c',
|
| 'src/crypto/rand/rand.c',
|
| 'src/crypto/rand/urandom.c',
|
| 'src/crypto/rand/windows.c',
|
| @@ -223,11 +229,13 @@
|
| 'src/crypto/x509/a_sign.c',
|
| 'src/crypto/x509/a_strex.c',
|
| 'src/crypto/x509/a_verify.c',
|
| + 'src/crypto/x509/algorithm.c',
|
| 'src/crypto/x509/asn1_gen.c',
|
| 'src/crypto/x509/by_dir.c',
|
| 'src/crypto/x509/by_file.c',
|
| 'src/crypto/x509/i2d_pr.c',
|
| 'src/crypto/x509/pkcs7.c',
|
| + 'src/crypto/x509/rsa_pss.c',
|
| 'src/crypto/x509/t_crl.c',
|
| 'src/crypto/x509/t_req.c',
|
| 'src/crypto/x509/t_x509.c',
|
| @@ -303,6 +311,8 @@
|
| ],
|
| 'boringssl_linux_aarch64_sources': [
|
| 'linux-aarch64/crypto/aes/aesv8-armx64.S',
|
| + 'linux-aarch64/crypto/bn/armv8-mont.S',
|
| + 'linux-aarch64/crypto/chacha/chacha-armv8.S',
|
| 'linux-aarch64/crypto/modes/ghashv8-armx64.S',
|
| 'linux-aarch64/crypto/sha/sha1-armv8.S',
|
| 'linux-aarch64/crypto/sha/sha256-armv8.S',
|
| @@ -313,13 +323,13 @@
|
| 'linux-arm/crypto/aes/aesv8-armx32.S',
|
| 'linux-arm/crypto/aes/bsaes-armv7.S',
|
| 'linux-arm/crypto/bn/armv4-mont.S',
|
| + 'linux-arm/crypto/chacha/chacha-armv4.S',
|
| 'linux-arm/crypto/modes/ghash-armv4.S',
|
| 'linux-arm/crypto/modes/ghashv8-armx32.S',
|
| 'linux-arm/crypto/sha/sha1-armv4-large.S',
|
| 'linux-arm/crypto/sha/sha256-armv4.S',
|
| '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': [
|
| @@ -329,7 +339,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/chacha/chacha-x86.S',
|
| 'linux-x86/crypto/md5/md5-586.S',
|
| 'linux-x86/crypto/modes/ghash-x86.S',
|
| 'linux-x86/crypto/rc4/rc4-586.S',
|
| @@ -346,16 +356,17 @@
|
| '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/cpu-x86_64-asm.S',
|
| + 'linux-x86_64/crypto/chacha/chacha-x86_64.S',
|
| + 'linux-x86_64/crypto/ec/p256-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',
|
| @@ -364,7 +375,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/chacha/chacha-x86.S',
|
| 'mac-x86/crypto/md5/md5-586.S',
|
| 'mac-x86/crypto/modes/ghash-x86.S',
|
| 'mac-x86/crypto/rc4/rc4-586.S',
|
| @@ -381,16 +392,17 @@
|
| '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/cpu-x86_64-asm.S',
|
| + 'mac-x86_64/crypto/chacha/chacha-x86_64.S',
|
| + 'mac-x86_64/crypto/ec/p256-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',
|
| 'mac-x86_64/crypto/sha/sha512-x86_64.S',
|
| + 'src/crypto/curve25519/asm/x25519-asm-x86_64.S',
|
| ],
|
| 'boringssl_win_x86_sources': [
|
| 'win-x86/crypto/aes/aes-586.asm',
|
| @@ -399,7 +411,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/chacha/chacha-x86.asm',
|
| 'win-x86/crypto/md5/md5-586.asm',
|
| 'win-x86/crypto/modes/ghash-x86.asm',
|
| 'win-x86/crypto/rc4/rc4-586.asm',
|
| @@ -416,12 +428,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/cpu-x86_64-asm.asm',
|
| + 'win-x86_64/crypto/chacha/chacha-x86_64.asm',
|
| + 'win-x86_64/crypto/ec/p256-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',
|
|
|