Roll src/third_party/boringssl/src ddfcc6a60..1e5cb820d

https://boringssl.googlesource.com/boringssl/+log/ddfcc6a60bec2040b4c3668d76c0f2455ecb5594..1e5cb820de99c754b57ab4321e1456ac6bdc1a78

BUG=none

Review-Url: https://codereview.chromium.org/2869243005
Cr-Commit-Position: refs/heads/master@{#471011}

DEPS

@@ -72,7 +72,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling BoringSSL
   # and whatever else without interference from each other.
-  'boringssl_revision': 'ddfcc6a60bec2040b4c3668d76c0f2455ecb5594',
+  'boringssl_revision': '1e5cb820de99c754b57ab4321e1456ac6bdc1a78',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling google-toolbox-for-mac
   # and whatever else without interference from each other.

third_party/boringssl/BUILD.generated.gni

@@ -59,21 +59,18 @@ crypto_sources = [
   "src/crypto/bytestring/cbs.c",
   "src/crypto/bytestring/internal.h",
   "src/crypto/chacha/chacha.c",
-  "src/crypto/cipher/aead.c",
-  "src/crypto/cipher/cipher.c",
-  "src/crypto/cipher/derive_key.c",
-  "src/crypto/cipher/e_aes.c",
-  "src/crypto/cipher/e_aesctrhmac.c",
-  "src/crypto/cipher/e_aesgcmsiv.c",
-  "src/crypto/cipher/e_chacha20poly1305.c",
-  "src/crypto/cipher/e_des.c",
-  "src/crypto/cipher/e_null.c",
-  "src/crypto/cipher/e_rc2.c",
-  "src/crypto/cipher/e_rc4.c",
-  "src/crypto/cipher/e_ssl3.c",
-  "src/crypto/cipher/e_tls.c",
-  "src/crypto/cipher/internal.h",
-  "src/crypto/cipher/tls_cbc.c",
+  "src/crypto/cipher_extra/cipher_extra.c",
+  "src/crypto/cipher_extra/derive_key.c",
+  "src/crypto/cipher_extra/e_aesctrhmac.c",
+  "src/crypto/cipher_extra/e_aesgcmsiv.c",
+  "src/crypto/cipher_extra/e_chacha20poly1305.c",
+  "src/crypto/cipher_extra/e_null.c",
+  "src/crypto/cipher_extra/e_rc2.c",
+  "src/crypto/cipher_extra/e_rc4.c",
+  "src/crypto/cipher_extra/e_ssl3.c",
+  "src/crypto/cipher_extra/e_tls.c",
+  "src/crypto/cipher_extra/internal.h",
+  "src/crypto/cipher_extra/tls_cbc.c",
   "src/crypto/cmac/cmac.c",
   "src/crypto/conf/conf.c",
   "src/crypto/conf/conf_def.h",
@@ -96,23 +93,9 @@ crypto_sources = [
   "src/crypto/digest_extra/internal.h",
   "src/crypto/dsa/dsa.c",
   "src/crypto/dsa/dsa_asn1.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/internal.h",
-  "src/crypto/ec/oct.c",
-  "src/crypto/ec/p224-64.c",
-  "src/crypto/ec/p256-64.c",
-  "src/crypto/ec/p256-x86_64-table.h",
-  "src/crypto/ec/p256-x86_64.c",
-  "src/crypto/ec/p256-x86_64.h",
-  "src/crypto/ec/simple.c",
-  "src/crypto/ec/util-64.c",
-  "src/crypto/ec/wnaf.c",
+  "src/crypto/ec_extra/ec_asn1.c",
   "src/crypto/ecdh/ecdh.c",
-  "src/crypto/ecdsa/ecdsa.c",
-  "src/crypto/ecdsa/ecdsa_asn1.c",
+  "src/crypto/ecdsa_extra/ecdsa_asn1.c",
   "src/crypto/engine/engine.c",
   "src/crypto/err/err.c",
   "src/crypto/evp/digestsign.c",
@@ -131,16 +114,22 @@ crypto_sources = [
   "src/crypto/evp/print.c",
   "src/crypto/evp/sign.c",
   "src/crypto/ex_data.c",
+  "src/crypto/fipsmodule/aes/internal.h",
   "src/crypto/fipsmodule/bcm.c",
   "src/crypto/fipsmodule/bn/internal.h",
   "src/crypto/fipsmodule/bn/rsaz_exp.h",
+  "src/crypto/fipsmodule/cipher/internal.h",
   "src/crypto/fipsmodule/delocate.h",
   "src/crypto/fipsmodule/des/internal.h",
   "src/crypto/fipsmodule/digest/internal.h",
   "src/crypto/fipsmodule/digest/md32_common.h",
+  "src/crypto/fipsmodule/ec/internal.h",
+  "src/crypto/fipsmodule/ec/p256-x86_64-table.h",
+  "src/crypto/fipsmodule/ec/p256-x86_64.h",
   "src/crypto/fipsmodule/is_fips.c",
   "src/crypto/fipsmodule/modes/internal.h",
   "src/crypto/fipsmodule/rand/internal.h",
+  "src/crypto/fipsmodule/rsa/internal.h",
   "src/crypto/hkdf/hkdf.c",
   "src/crypto/internal.h",
   "src/crypto/lhash/lhash.c",
@@ -177,12 +166,7 @@ crypto_sources = [
   "src/crypto/rc4/rc4.c",
   "src/crypto/refcount_c11.c",
   "src/crypto/refcount_lock.c",
-  "src/crypto/rsa/blinding.c",
-  "src/crypto/rsa/internal.h",
-  "src/crypto/rsa/padding.c",
-  "src/crypto/rsa/rsa.c",
-  "src/crypto/rsa/rsa_asn1.c",
-  "src/crypto/rsa/rsa_impl.c",
+  "src/crypto/rsa_extra/rsa_asn1.c",
   "src/crypto/stack/stack.c",
   "src/crypto/thread.c",
   "src/crypto/thread_none.c",
@@ -436,14 +420,15 @@ crypto_sources_linux_x86 = [
 
 crypto_sources_linux_x86_64 = [
   "linux-x86_64/crypto/chacha/chacha-x86_64.S",
-  "linux-x86_64/crypto/cipher/chacha20_poly1305_x86_64.S",
-  "linux-x86_64/crypto/ec/p256-x86_64-asm.S",
+  "linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",
+  "linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S",
   "linux-x86_64/crypto/fipsmodule/aes-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/aesni-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/bsaes-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/ghash-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/md5-x86_64.S",
+  "linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S",
   "linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S",
   "linux-x86_64/crypto/fipsmodule/rsaz-avx2.S",
   "linux-x86_64/crypto/fipsmodule/sha1-x86_64.S",
@@ -472,14 +457,15 @@ crypto_sources_mac_x86 = [
 
 crypto_sources_mac_x86_64 = [
   "mac-x86_64/crypto/chacha/chacha-x86_64.S",
-  "mac-x86_64/crypto/cipher/chacha20_poly1305_x86_64.S",
-  "mac-x86_64/crypto/ec/p256-x86_64-asm.S",
+  "mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S",
+  "mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S",
   "mac-x86_64/crypto/fipsmodule/aes-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/aesni-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/bsaes-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/ghash-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/md5-x86_64.S",
+  "mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S",
   "mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S",
   "mac-x86_64/crypto/fipsmodule/rsaz-avx2.S",
   "mac-x86_64/crypto/fipsmodule/sha1-x86_64.S",
@@ -508,14 +494,15 @@ crypto_sources_win_x86 = [
 
 crypto_sources_win_x86_64 = [
   "win-x86_64/crypto/chacha/chacha-x86_64.asm",
-  "win-x86_64/crypto/cipher/chacha20_poly1305_x86_64.asm",
-  "win-x86_64/crypto/ec/p256-x86_64-asm.asm",
+  "win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm",
+  "win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm",
   "win-x86_64/crypto/fipsmodule/aes-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/aesni-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/bsaes-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/ghash-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/md5-x86_64.asm",
+  "win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm",
   "win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm",
   "win-x86_64/crypto/fipsmodule/rsaz-avx2.asm",
   "win-x86_64/crypto/fipsmodule/sha1-x86_64.asm",

third_party/boringssl/BUILD.generated_tests.gni

@@ -29,11 +29,11 @@ crypto_test_sources = [
   "src/crypto/curve25519/x25519_test.cc",
   "src/crypto/dh/dh_test.cc",
   "src/crypto/dsa/dsa_test.cc",
-  "src/crypto/ec/ec_test.cc",
   "src/crypto/err/err_test.cc",
   "src/crypto/evp/evp_extra_test.cc",
+  "src/crypto/fipsmodule/ec/ec_test.cc",
   "src/crypto/fipsmodule/rand/ctrdrbg_test.cc",
-  "src/crypto/rsa/rsa_test.cc",
+  "src/crypto/rsa_extra/rsa_test.cc",
   "src/crypto/test/gtest_main.cc",
 ]
 
@@ -45,7 +45,7 @@ ssl_test_sources = [
 template("create_tests") {
   executable("boringssl_aead_test") {
     sources = [
-      "src/crypto/cipher/aead_test.cc",
+      "src/crypto/cipher_extra/aead_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -57,7 +57,7 @@ template("create_tests") {
 
   executable("boringssl_cipher_test") {
     sources = [
-      "src/crypto/cipher/cipher_test.cc",
+      "src/crypto/cipher_extra/cipher_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -91,9 +91,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_example_mul") {
+  executable("boringssl_ecdh_test") {
     sources = [
-      "src/crypto/ec/example_mul.c",
+      "src/crypto/ecdh/ecdh_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -103,9 +103,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_p256-x86_64_test") {
+  executable("boringssl_evp_test") {
     sources = [
-      "src/crypto/ec/p256-x86_64_test.cc",
+      "src/crypto/evp/evp_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -115,9 +115,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_ecdh_test") {
+  executable("boringssl_pbkdf_test") {
     sources = [
-      "src/crypto/ecdh/ecdh_test.cc",
+      "src/crypto/evp/pbkdf_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -127,9 +127,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_ecdsa_sign_test") {
+  executable("boringssl_aes_test") {
     sources = [
-      "src/crypto/ecdsa/ecdsa_sign_test.cc",
+      "src/crypto/fipsmodule/aes/aes_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -139,9 +139,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_ecdsa_test") {
+  executable("boringssl_bn_test") {
     sources = [
-      "src/crypto/ecdsa/ecdsa_test.cc",
+      "src/crypto/fipsmodule/bn/bn_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -151,9 +151,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_ecdsa_verify_test") {
+  executable("boringssl_example_mul") {
     sources = [
-      "src/crypto/ecdsa/ecdsa_verify_test.cc",
+      "src/crypto/fipsmodule/ec/example_mul.c",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -163,9 +163,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_evp_test") {
+  executable("boringssl_p256-x86_64_test") {
     sources = [
-      "src/crypto/evp/evp_test.cc",
+      "src/crypto/fipsmodule/ec/p256-x86_64_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -175,9 +175,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_pbkdf_test") {
+  executable("boringssl_ecdsa_sign_test") {
     sources = [
-      "src/crypto/evp/pbkdf_test.cc",
+      "src/crypto/fipsmodule/ecdsa/ecdsa_sign_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -187,9 +187,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_aes_test") {
+  executable("boringssl_ecdsa_test") {
     sources = [
-      "src/crypto/fipsmodule/aes/aes_test.cc",
+      "src/crypto/fipsmodule/ecdsa/ecdsa_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {
@@ -199,9 +199,9 @@ template("create_tests") {
     deps = invoker.deps
   }
 
-  executable("boringssl_bn_test") {
+  executable("boringssl_ecdsa_verify_test") {
     sources = [
-      "src/crypto/fipsmodule/bn/bn_test.cc",
+      "src/crypto/fipsmodule/ecdsa/ecdsa_verify_test.cc",
     ]
     sources += test_support_sources
     if (defined(invoker.configs_exclude)) {