external/boringssl: Sync to 5e578c9dba73460c3eb17f771c77fc8e36f7812e.

This includes the following changes:

https://boringssl.googlesource.com/boringssl/+log/58e449904e248f34bdfc2be7a609c58bcb0257b7..5e578c9dba73460c3eb17f771c77fc8e36f7812e

Test: BoringSSL CTS Presubmits
Change-Id: Ic1541b034545fa58a284ca35134b3719303455c7

1 files changed, 67 insertions, 103 deletions

diff --git a/sources.bp b/sources.bp
index ad33e9b8..6cc10a89 100644
--- a/sources.bp
+++ b/sources.bp
@@ -41,7 +41,6 @@ cc_defaults {
         "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/tasn_dec.c",
         "src/crypto/asn1/tasn_enc.c",
         "src/crypto/asn1/tasn_fre.c",
@@ -60,46 +59,25 @@ cc_defaults {
         "src/crypto/bio/printf.c",
         "src/crypto/bio/socket.c",
         "src/crypto/bio/socket_helper.c",
-        "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",
-        "src/crypto/bn/div.c",
-        "src/crypto/bn/exponentiation.c",
-        "src/crypto/bn/gcd.c",
-        "src/crypto/bn/generic.c",
-        "src/crypto/bn/jacobi.c",
-        "src/crypto/bn/montgomery.c",
-        "src/crypto/bn/montgomery_inv.c",
-        "src/crypto/bn/mul.c",
-        "src/crypto/bn/prime.c",
-        "src/crypto/bn/random.c",
-        "src/crypto/bn/rsaz_exp.c",
-        "src/crypto/bn/shift.c",
-        "src/crypto/bn/sqrt.c",
+        "src/crypto/bn_extra/bn_asn1.c",
+        "src/crypto/bn_extra/convert.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.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/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/tls_cbc.c",
         "src/crypto/cmac/cmac.c",
         "src/crypto/conf/conf.c",
         "src/crypto/cpu-aarch64-linux.c",
@@ -111,7 +89,6 @@ cc_defaults {
         "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",
@@ -119,20 +96,9 @@ cc_defaults {
         "src/crypto/digest_extra/digest_extra.c",
         "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/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",
+        "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",
@@ -148,6 +114,7 @@ cc_defaults {
         "src/crypto/evp/p_rsa_asn1.c",
         "src/crypto/evp/pbkdf.c",
         "src/crypto/evp/print.c",
+        "src/crypto/evp/scrypt.c",
         "src/crypto/evp/sign.c",
         "src/crypto/ex_data.c",
         "src/crypto/fipsmodule/bcm.c",
@@ -182,11 +149,7 @@ cc_defaults {
         "src/crypto/rc4/rc4.c",
         "src/crypto/refcount_c11.c",
         "src/crypto/refcount_lock.c",
-        "src/crypto/rsa/blinding.c",
-        "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",
@@ -226,7 +189,6 @@ cc_defaults {
         "src/crypto/x509/x509name.c",
         "src/crypto/x509/x509rset.c",
         "src/crypto/x509/x509spki.c",
-        "src/crypto/x509/x509type.c",
         "src/crypto/x509/x_algor.c",
         "src/crypto/x509/x_all.c",
         "src/crypto/x509/x_attrib.c",
@@ -278,9 +240,9 @@ cc_defaults {
     target: {
         android_arm64: {
             srcs: [
-                "linux-aarch64/crypto/bn/armv8-mont.S",
                 "linux-aarch64/crypto/chacha/chacha-armv8.S",
                 "linux-aarch64/crypto/fipsmodule/aesv8-armx64.S",
+                "linux-aarch64/crypto/fipsmodule/armv8-mont.S",
                 "linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S",
                 "linux-aarch64/crypto/fipsmodule/sha1-armv8.S",
                 "linux-aarch64/crypto/fipsmodule/sha256-armv8.S",
@@ -289,10 +251,10 @@ cc_defaults {
         },
         android_arm: {
             srcs: [
-                "linux-arm/crypto/bn/armv4-mont.S",
                 "linux-arm/crypto/chacha/chacha-armv4.S",
                 "linux-arm/crypto/fipsmodule/aes-armv4.S",
                 "linux-arm/crypto/fipsmodule/aesv8-armx32.S",
+                "linux-arm/crypto/fipsmodule/armv4-mont.S",
                 "linux-arm/crypto/fipsmodule/bsaes-armv7.S",
                 "linux-arm/crypto/fipsmodule/ghash-armv4.S",
                 "linux-arm/crypto/fipsmodule/ghashv8-armx32.S",
@@ -305,77 +267,79 @@ cc_defaults {
         },
         android_x86: {
             srcs: [
-                "linux-x86/crypto/bn/bn-586.S",
-                "linux-x86/crypto/bn/co-586.S",
-                "linux-x86/crypto/bn/x86-mont.S",
                 "linux-x86/crypto/chacha/chacha-x86.S",
                 "linux-x86/crypto/fipsmodule/aes-586.S",
                 "linux-x86/crypto/fipsmodule/aesni-x86.S",
+                "linux-x86/crypto/fipsmodule/bn-586.S",
+                "linux-x86/crypto/fipsmodule/co-586.S",
                 "linux-x86/crypto/fipsmodule/ghash-x86.S",
                 "linux-x86/crypto/fipsmodule/md5-586.S",
                 "linux-x86/crypto/fipsmodule/sha1-586.S",
                 "linux-x86/crypto/fipsmodule/sha256-586.S",
                 "linux-x86/crypto/fipsmodule/sha512-586.S",
                 "linux-x86/crypto/fipsmodule/vpaes-x86.S",
+                "linux-x86/crypto/fipsmodule/x86-mont.S",
             ],
         },
         linux_x86: {
             srcs: [
-                "linux-x86/crypto/bn/bn-586.S",
-                "linux-x86/crypto/bn/co-586.S",
-                "linux-x86/crypto/bn/x86-mont.S",
                 "linux-x86/crypto/chacha/chacha-x86.S",
                 "linux-x86/crypto/fipsmodule/aes-586.S",
                 "linux-x86/crypto/fipsmodule/aesni-x86.S",
+                "linux-x86/crypto/fipsmodule/bn-586.S",
+                "linux-x86/crypto/fipsmodule/co-586.S",
                 "linux-x86/crypto/fipsmodule/ghash-x86.S",
                 "linux-x86/crypto/fipsmodule/md5-586.S",
                 "linux-x86/crypto/fipsmodule/sha1-586.S",
                 "linux-x86/crypto/fipsmodule/sha256-586.S",
                 "linux-x86/crypto/fipsmodule/sha512-586.S",
                 "linux-x86/crypto/fipsmodule/vpaes-x86.S",
+                "linux-x86/crypto/fipsmodule/x86-mont.S",
             ],
         },
         android_x86_64: {
             srcs: [
-                "linux-x86_64/crypto/bn/rsaz-avx2.S",
-                "linux-x86_64/crypto/bn/x86_64-mont.S",
-                "linux-x86_64/crypto/bn/x86_64-mont5.S",
                 "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",
                 "linux-x86_64/crypto/fipsmodule/sha256-x86_64.S",
                 "linux-x86_64/crypto/fipsmodule/sha512-x86_64.S",
                 "linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S",
+                "linux-x86_64/crypto/fipsmodule/x86_64-mont.S",
+                "linux-x86_64/crypto/fipsmodule/x86_64-mont5.S",
                 "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
             ],
         },
         linux_x86_64: {
             srcs: [
-                "linux-x86_64/crypto/bn/rsaz-avx2.S",
-                "linux-x86_64/crypto/bn/x86_64-mont.S",
-                "linux-x86_64/crypto/bn/x86_64-mont5.S",
                 "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",
                 "linux-x86_64/crypto/fipsmodule/sha256-x86_64.S",
                 "linux-x86_64/crypto/fipsmodule/sha512-x86_64.S",
                 "linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S",
+                "linux-x86_64/crypto/fipsmodule/x86_64-mont.S",
+                "linux-x86_64/crypto/fipsmodule/x86_64-mont5.S",
                 "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
             ],
         },
@@ -456,24 +420,51 @@ cc_defaults {
 cc_defaults {
     name: "boringssl_crypto_test_sources",
     srcs: [
+        "crypto_test_data.cc",
         "src/crypto/asn1/asn1_test.cc",
         "src/crypto/base64/base64_test.cc",
         "src/crypto/bio/bio_test.cc",
         "src/crypto/bytestring/bytestring_test.cc",
         "src/crypto/chacha/chacha_test.cc",
+        "src/crypto/cipher_extra/aead_test.cc",
+        "src/crypto/cipher_extra/cipher_test.cc",
         "src/crypto/cmac/cmac_test.cc",
         "src/crypto/compiler_test.cc",
         "src/crypto/constant_time_test.cc",
+        "src/crypto/curve25519/ed25519_test.cc",
         "src/crypto/curve25519/spake25519_test.cc",
         "src/crypto/curve25519/x25519_test.cc",
         "src/crypto/dh/dh_test.cc",
+        "src/crypto/digest_extra/digest_test.cc",
         "src/crypto/dsa/dsa_test.cc",
-        "src/crypto/ec/ec_test.cc",
+        "src/crypto/ecdh/ecdh_test.cc",
         "src/crypto/err/err_test.cc",
         "src/crypto/evp/evp_extra_test.cc",
+        "src/crypto/evp/evp_test.cc",
+        "src/crypto/evp/pbkdf_test.cc",
+        "src/crypto/evp/scrypt_test.cc",
+        "src/crypto/fipsmodule/aes/aes_test.cc",
+        "src/crypto/fipsmodule/bn/bn_test.cc",
+        "src/crypto/fipsmodule/ec/ec_test.cc",
+        "src/crypto/fipsmodule/ec/p256-x86_64_test.cc",
+        "src/crypto/fipsmodule/ecdsa/ecdsa_test.cc",
+        "src/crypto/fipsmodule/modes/gcm_test.cc",
         "src/crypto/fipsmodule/rand/ctrdrbg_test.cc",
-        "src/crypto/rsa/rsa_test.cc",
+        "src/crypto/hkdf/hkdf_test.cc",
+        "src/crypto/hmac_extra/hmac_test.cc",
+        "src/crypto/lhash/lhash_test.cc",
+        "src/crypto/obj/obj_test.cc",
+        "src/crypto/pkcs7/pkcs7_test.cc",
+        "src/crypto/pkcs8/pkcs12_test.cc",
+        "src/crypto/pkcs8/pkcs8_test.cc",
+        "src/crypto/poly1305/poly1305_test.cc",
+        "src/crypto/pool/pool_test.cc",
+        "src/crypto/refcount_test.cc",
+        "src/crypto/rsa_extra/rsa_test.cc",
+        "src/crypto/test/file_test_gtest.cc",
         "src/crypto/test/gtest_main.cc",
+        "src/crypto/thread_test.cc",
+        "src/crypto/x509/x509_test.cc",
     ],
 }
 
@@ -488,34 +479,7 @@ cc_defaults {
 cc_defaults {
     name: "boringssl_tests_sources",
     srcs: [
-        "src/crypto/bn/bn_test.cc",
-        "src/crypto/cipher/aead_test.cc",
-        "src/crypto/cipher/cipher_test.cc",
-        "src/crypto/curve25519/ed25519_test.cc",
-        "src/crypto/digest_extra/digest_test.cc",
-        "src/crypto/ec/example_mul.c",
-        "src/crypto/ec/p256-x86_64_test.cc",
-        "src/crypto/ecdh/ecdh_test.cc",
-        "src/crypto/ecdsa/ecdsa_sign_test.cc",
-        "src/crypto/ecdsa/ecdsa_test.cc",
-        "src/crypto/ecdsa/ecdsa_verify_test.cc",
-        "src/crypto/evp/evp_test.cc",
-        "src/crypto/evp/pbkdf_test.cc",
-        "src/crypto/fipsmodule/aes/aes_test.cc",
-        "src/crypto/fipsmodule/modes/gcm_test.cc",
-        "src/crypto/fipsmodule/rand/ctrdrbg_vector_test.cc",
-        "src/crypto/hkdf/hkdf_test.cc",
-        "src/crypto/hmac_extra/hmac_test.cc",
-        "src/crypto/lhash/lhash_test.cc",
-        "src/crypto/obj/obj_test.cc",
-        "src/crypto/pkcs7/pkcs7_test.c",
-        "src/crypto/pkcs8/pkcs12_test.cc",
-        "src/crypto/pkcs8/pkcs8_test.cc",
-        "src/crypto/poly1305/poly1305_test.cc",
-        "src/crypto/pool/pool_test.cc",
-        "src/crypto/refcount_test.cc",
-        "src/crypto/thread_test.c",
-        "src/crypto/x509/x509_test.cc",
+        "src/crypto/fipsmodule/ec/example_mul.c",
         "src/crypto/x509v3/tab_test.c",
         "src/crypto/x509v3/v3name_test.c",
     ],