Revert of Roll src/third_party/boringssl/src/ to bd15a8e74894616ca8ad04fc2942b958f99000a1 (patchset #2 id:20001 of https://codereview.chromium.org/1160863005/)

Reason for revert:
This broke Android x86/x64/mips builders, see
https://chromegw.corp.google.com/i/chromium.fyi/builders/Android%20x86%20Builder%20%28dbg%29/builds/39732

The underlying issue is that __libc_malloc is not defined on Android.

Original issue's description:
> Roll src/third_party/boringssl/src/ to bd15a8e74894616ca8ad04fc2942b958f99000a1
>
> $ git log a7997f12b..bd15a8e74 --date=short --format='%ad %ae %s'
> 2015-05-29 davidben Fix DTLS handling of multiple records in a packet.
> 2015-05-27 davidben Fix bn_test's bc output and shut it up a little.
> 2015-05-26 davidben Tidy up overflows in obj_cmp.
> 2015-05-27 agl Readd CRYPTO_{LOCK|UNLOCK|READ|WRITE}.
> 2015-05-18 agl Add |BIO_read_asn1| to read a single ASN.1 object.
> 2015-05-27 davidben Fix signed/unsigned warning in bn_test.cc.
> 2015-05-26 davidben Fix off-by-one in BN_rand
> 2015-05-26 davidben Reject negative shifts for BN_rshift and BN_lshift.
> 2015-05-26 davidben aes/asm/bsaes-armv7.pl: fix compilation with Xcode 6.3.
> 2015-05-26 davidben Add OPENSSL_PUT_ERROR line to X509V3_parse_list.
> 2015-05-26 davidben Fix typo in valid_star.
> 2015-05-26 davidben Release handshake buffer when sending no certificate.
> 2015-05-26 davidben Release the handshake buffer on the client for abbreviated handshakes.
> 2015-05-26 davidben Decide whether or not to request client certificates early.
> 2015-05-26 davidben Remove server-side renego session resumption check.
> 2015-05-26 davidben Deprecate and no-op SSL_VERIFY_CLIENT_ONCE.
> 2015-05-26 davidben Remove fake RLE compression OID.
> 2015-05-26 davidben Fix typo in objects.txt
> 2015-05-21 davidben Add some comments and tweak assertions for cbc.c.
> 2015-05-21 davidben Don't make SSL_MODE_*HELLO_TIME configurable.
> 2015-05-26 davidben Have consumers supply OPENSSL_C11_ATOMIC.
> 2015-05-27 davidben Revert "tool: we don't need -lrt."
> 2015-05-06 mab Do-nothing fns |OpenSSL_add_all_ciphers| and |OpenSSL_add_all_digests|.
> 2015-05-15 davidben Deprecate and no-op SSL_set_state.
> 2015-05-15 davidben Remove compatibility s->version checks.
> 2015-05-15 davidben Remove SSL_in_before and SSL_ST_BEFORE.
> 2015-05-21 davidben Remove renegotiation deferral logic.
> 2015-05-21 davidben Forbid caller-initiated renegotiations and all renego as a servers.
> 2015-05-21 agl Fix test used for not-in-place CBC mode.
> 2015-05-15 davidben Remove s->renegotiate check in SSL_clear.
> 2015-05-15 davidben Switch three more renegotiate checks to initial_handshake_complete.
> 2015-05-15 davidben Remove remnants of DTLS renegotiate.
> 2015-05-16 davidben Deprecate SSL_*_read_ahead and enforce DTLS packet boundaries.
> 2015-05-21 davidben Fix Windows mode.
> 2015-05-15 davidben Fix some malloc test crashs.
> 2015-05-15 davidben Add malloc test support to unit tests.
> 2015-04-05 davidben Pass a dtls1_use_epoch enum down to dtls1_seal_record.
> 2015-03-03 davidben Factor SSL_AEAD_CTX into a dedicated type.
> 2015-05-19 mab Get version-related functions from crypto.h rather than ssl.h.
> 2015-05-16 davidben Pull version, option, and mode APIs into their own sections.
> 2015-05-16 davidben Prune version constants.
> 2015-05-16 davidben Remove ssl_ok.
> 2015-05-16 davidben Unexport ssl_get_new_session and ssl_update_cache.
> 2015-05-16 davidben Fix some documentation typos.
> 2015-05-16 davidben Also skip #elif lines.
> 2015-05-16 davidben Parse macros in getNameFromDecl.
> 2015-05-16 davidben Document some core SSL_CTX and SSL methods.
> 2015-05-16 davidben Don't use struct names in ssl.h.
> 2015-05-15 davidben Tidy up state machine coverage tests.
> 2015-05-15 davidben Add client peer-initiated renego to the state machine tests.
> 2015-05-15 davidben Add client-side tests for renegotiation_info enforcement.
> 2015-05-20 agl Specify argc and argv arguments to refcount_test:main.
> 2015-05-20 agl Try to fix MSVC and __STDC_VERSION__ again.
> 2015-05-20 agl Cast refcounts to _Atomic before use.
> 2015-05-20 agl Try again to only test __STDC_VERSION__ when defined.
> 2015-05-20 agl Disable C11 atomics on OS X.
> 2015-05-20 agl Tag the mutex functions with OPENSSL_EXPORT.
> 2015-05-20 agl Don't test __STDC_VERSION__ unless it's defined.
> 2015-05-15 alangley Remove leftovers of the old-style locks.
> 2015-05-15 alangley Remove last references to named locks.
> 2015-05-15 alangley Remove remaining calls to the old lock functions.
> 2015-05-15 alangley Remove |CRYPTO_add|.
> 2015-05-15 alangley Convert reference counts in ssl/
> 2015-05-15 alangley Convert reference counts in crypto/
> 2015-05-15 alangley Add infrastructure for reference counts.
> 2015-05-15 alangley Use C11 _Static_assert where available.
> 2015-05-15 mab Implement |DES_ede2_cbc_encrypt|.
>
> BUG=none
>
> Committed: https://crrev.com/4c5266e384416504ded7777408ec53831da91e19
> Cr-Commit-Position: refs/heads/master@{#332094}

TBR=agl@chromium.org,davidben@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Review URL: https://codereview.chromium.org/1161213003

Cr-Commit-Position: refs/heads/master@{#332184}

5 files changed, 641 insertions, 679 deletions

diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi
index c17bcd0..6187637 100644
--- a/third_party/boringssl/boringssl.gypi
+++ b/third_party/boringssl/boringssl.gypi
@@ -175,8 +175,6 @@
       'src/crypto/rand/urandom.c',
       'src/crypto/rand/windows.c',
       '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',
@@ -286,7 +284,6 @@
       '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_cert.c',
diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi
index 1175a86..58dc9ad 100644
--- a/third_party/boringssl/boringssl_tests.gypi
+++ b/third_party/boringssl/boringssl_tests.gypi
@@ -329,20 +329,6 @@
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
-      'target_name': 'boringssl_refcount_test',
-      'type': 'executable',
-      'dependencies': [
-        'boringssl.gyp:boringssl',
-      ],
-      'sources': [
-        'src/crypto/refcount_test.c',
-        '<@(boringssl_test_support_sources)',
-      ],
-      # TODO(davidben): Fix size_t truncations in BoringSSL.
-      # https://crbug.com/429039
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
       'target_name': 'boringssl_rsa_test',
       'type': 'executable',
       'dependencies': [
@@ -416,7 +402,6 @@
   'variables': {
     'boringssl_test_support_sources': [
       'src/crypto/test/file_test.cc',
-      'src/crypto/test/malloc.cc',
     ],
     'boringssl_test_targets': [
       'boringssl_aead_test',
@@ -444,7 +429,6 @@
       'boringssl_pkcs12_test',
       'boringssl_pkcs7_test',
       'boringssl_pqueue_test',
-      'boringssl_refcount_test',
       'boringssl_rsa_test',
       'boringssl_ssl_test',
       'boringssl_thread_test',
diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc
index 7dfe91c..3f765bf61 100644
--- a/third_party/boringssl/boringssl_unittest.cc
+++ b/third_party/boringssl/boringssl_unittest.cc
@@ -200,21 +200,11 @@ TEST(BoringSSL, ERR) {
   TestSimple("err_test");
 }
 
-TEST(BoringSSL, EVP) {
-  base::FilePath data_file;
-  ASSERT_TRUE(BoringSSLPath(&data_file));
-  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("evp_tests.txt"));
-
-  std::vector<base::CommandLine::StringType> args;
-  args.push_back(data_file.value());
-
-  TestProcess("evp_test", args);
+TEST(BoringSSL, GCM) {
+  TestSimple("gcm_test");
 }
 
-// evp_test is also run on hmac_test's input.
-TEST(BoringSSL, EVPHMAC) {
+TEST(BoringSSL, HMAC) {
   base::FilePath data_file;
   ASSERT_TRUE(BoringSSLPath(&data_file));
   data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
@@ -224,68 +214,74 @@ TEST(BoringSSL, EVPHMAC) {
   std::vector<base::CommandLine::StringType> args;
   args.push_back(data_file.value());
 
-  TestProcess("evp_test", args);
+  TestProcess("hmac_test", args);
 }
 
-TEST(BoringSSL, EVPExtra) {
-  TestSimple("evp_extra_test");
+TEST(BoringSSL, LH) {
+  TestSimple("lhash_test");
 }
 
-TEST(BoringSSL, ExampleMul) {
-  TestSimple("example_mul");
+TEST(BoringSSL, RSA) {
+  TestSimple("rsa_test");
 }
 
-TEST(BoringSSL, GCM) {
-  TestSimple("gcm_test");
+TEST(BoringSSL, PKCS7) {
+  TestSimple("pkcs7_test");
 }
 
-TEST(BoringSSL, HKDF) {
-  TestSimple("hkdf_test");
+TEST(BoringSSL, PKCS12) {
+  TestSimple("pkcs12_test");
 }
 
-TEST(BoringSSL, HMAC) {
+TEST(BoringSSL, ExampleMul) {
+  TestSimple("example_mul");
+}
+
+TEST(BoringSSL, EVP) {
   base::FilePath data_file;
   ASSERT_TRUE(BoringSSLPath(&data_file));
   data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
-  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
+  data_file = data_file.Append(FILE_PATH_LITERAL("evp"));
+  data_file = data_file.Append(FILE_PATH_LITERAL("evp_tests.txt"));
 
   std::vector<base::CommandLine::StringType> args;
   args.push_back(data_file.value());
 
-  TestProcess("hmac_test", args);
+  TestProcess("evp_test", args);
 }
 
-TEST(BoringSSL, LH) {
-  TestSimple("lhash_test");
-}
+// evp_test is also run on hmac_test's input.
+TEST(BoringSSL, EVPHMAC) {
+  base::FilePath data_file;
+  ASSERT_TRUE(BoringSSLPath(&data_file));
+  data_file = data_file.Append(FILE_PATH_LITERAL("crypto"));
+  data_file = data_file.Append(FILE_PATH_LITERAL("hmac"));
+  data_file = data_file.Append(FILE_PATH_LITERAL("hmac_tests.txt"));
 
-TEST(BoringSSL, PBKDF) {
-  TestSimple("pbkdf_test");
+  std::vector<base::CommandLine::StringType> args;
+  args.push_back(data_file.value());
+
+  TestProcess("evp_test", args);
 }
 
-TEST(BoringSSL, PKCS7) {
-  TestSimple("pkcs7_test");
+TEST(BoringSSL, EVPExtra) {
+  TestSimple("evp_extra_test");
 }
 
-TEST(BoringSSL, PKCS12) {
-  TestSimple("pkcs12_test");
+TEST(BoringSSL, SSL) {
+  TestSimple("ssl_test");
 }
 
 TEST(BoringSSL, PQueue) {
   TestSimple("pqueue_test");
 }
 
-TEST(BoringSSL, RefcountTest) {
-  TestSimple("refcount_test");
-}
-
-TEST(BoringSSL, RSA) {
-  TestSimple("rsa_test");
+TEST(BoringSSL, HKDF) {
+  TestSimple("hkdf_test");
 }
 
-TEST(BoringSSL, SSL) {
-  TestSimple("ssl_test");
+TEST(BoringSSL, PBKDF) {
+  TestSimple("pbkdf_test");
 }
 
 TEST(BoringSSL, Thread) {
diff --git a/third_party/boringssl/err_data.c b/third_party/boringssl/err_data.c
index 913a5d0..f09b1c2 100644
--- a/third_party/boringssl/err_data.c
+++ b/third_party/boringssl/err_data.c
@@ -54,229 +54,227 @@ OPENSSL_COMPILE_ASSERT(ERR_LIB_HKDF == 32, library_values_changed_32);
 OPENSSL_COMPILE_ASSERT(ERR_NUM_LIBS == 33, library_values_changed_num);
 
 const uint32_t kOpenSSLFunctionValues[] = {
-    0xc32054b,
-    0xc328556,
-    0xc330561,
-    0xc33856e,
-    0xc340578,
-    0xc348582,
-    0xc350589,
-    0xc358595,
-    0xc36059c,
-    0xc3685b2,
-    0xc3705d1,
-    0xc3785e2,
-    0xc3805f2,
-    0xc38860c,
-    0xc390621,
-    0xc398630,
-    0xc3a0649,
-    0xc3a865d,
-    0xc3b0669,
-    0xc3b8670,
-    0xc3c0678,
-    0xc3c8690,
-    0xc3d0698,
-    0xc3d86a0,
-    0xc3e06ab,
-    0xc3e85c7,
-    0xc3f0686,
-    0x1032193d,
-    0x10329954,
-    0x1033196d,
-    0x10339983,
-    0x10341993,
-    0x103499a6,
-    0x103519b4,
-    0x103599c3,
-    0x103619e3,
-    0x10369a02,
-    0x10371a1f,
-    0x10379a3c,
-    0x10381a51,
-    0x10389a73,
-    0x10391a92,
-    0x10399ab1,
-    0x103a1ac8,
-    0x103a9adf,
-    0x103b1ae8,
-    0x103b9af3,
-    0x103c1b0d,
-    0x103c9b15,
-    0x103d1b1d,
-    0x103d9b24,
-    0x103e1b37,
-    0x103e9b49,
-    0x103f1b5c,
-    0x103f9b65,
-    0x14320a4e,
-    0x14328a5c,
-    0x14330a68,
-    0x14338a75,
-    0x18361224,
-    0x18371252,
-    0x18379263,
-    0x18381279,
-    0x1839129c,
-    0x183992b1,
-    0x183a12c3,
-    0x183c1307,
-    0x183c9315,
-    0x183d1328,
-    0x183d9338,
-    0x183e935e,
-    0x183f1371,
-    0x183f9380,
-    0x184093aa,
-    0x18411416,
-    0x18419427,
-    0x1842143a,
-    0x1842944c,
-    0x1843145e,
-    0x1843946f,
-    0x18441480,
-    0x18449491,
-    0x184514a2,
-    0x184594af,
-    0x184614d1,
-    0x184694e4,
-    0x184714f8,
-    0x18479505,
-    0x18481514,
-    0x18489523,
-    0x18491534,
-    0x18499550,
-    0x184a155e,
-    0x184a956f,
-    0x184b1580,
-    0x184b958e,
-    0x184c159e,
-    0x184c95c4,
-    0x184d15d3,
-    0x184d95e3,
-    0x184e15f3,
-    0x184e9602,
-    0x184f1541,
-    0x184f91b3,
-    0x18501156,
-    0x1850916e,
-    0x18511190,
-    0x185191a2,
-    0x185211d4,
-    0x185291ed,
-    0x185311fe,
-    0x18539214,
-    0x18541239,
-    0x1854928a,
-    0x185512d3,
-    0x185592e8,
-    0x185612f5,
-    0x1856934d,
-    0x18571390,
-    0x1857939d,
-    0x185813b9,
-    0x185893ca,
-    0x185913da,
-    0x185993ea,
-    0x185a13f9,
-    0x185a9408,
-    0x185b14bd,
-    0x1c3206b8,
-    0x1c3286c4,
-    0x1c3306cf,
-    0x1c3386db,
-    0x20321616,
-    0x20329621,
-    0x20331629,
-    0x20339635,
-    0x24321641,
-    0x2432964f,
-    0x24331661,
-    0x24339670,
-    0x24341683,
-    0x24349696,
-    0x243516ad,
-    0x243596c5,
-    0x243616d3,
-    0x243696eb,
-    0x243716f4,
-    0x24379706,
-    0x2438171a,
-    0x24389727,
-    0x2439173d,
-    0x24399755,
-    0x243a176d,
-    0x243a9777,
-    0x243b178c,
-    0x243b979a,
-    0x243c17b2,
-    0x243c97c9,
-    0x243d17d4,
-    0x243d97e2,
-    0x28320aae,
-    0x28328abd,
-    0x28330ac8,
-    0x28338acd,
-    0x28340ad8,
-    0x2c322b06,
-    0x2c32ab12,
-    0x2c332b25,
-    0x2c33ab36,
-    0x2c342b4f,
-    0x2c34ab77,
-    0x2c352b8e,
-    0x2c35abab,
-    0x2c362bc8,
-    0x2c36abe5,
-    0x2c372bfe,
-    0x2c37ac17,
-    0x2c382c2d,
-    0x2c38ac3b,
-    0x2c392c4d,
-    0x2c39ac6a,
-    0x2c3a2c87,
-    0x2c3aac95,
-    0x2c3b2cb3,
-    0x2c3bacd1,
-    0x2c3c2cec,
-    0x2c3cad00,
-    0x2c3d2d12,
-    0x2c3dad22,
-    0x2c3e2d30,
-    0x2c3ead40,
-    0x2c3f2d50,
-    0x2c3fad6b,
-    0x2c402d7c,
-    0x2c40ad97,
-    0x2c412dab,
-    0x2c41adbe,
-    0x2c422ddd,
-    0x2c42adf1,
-    0x2c432e04,
-    0x2c43ae13,
-    0x2c442e22,
-    0x2c44ae39,
-    0x2c452e54,
-    0x2c45ae6c,
-    0x2c462e80,
-    0x2c46ae93,
-    0x2c472ea4,
-    0x2c47aeb5,
-    0x2c482ec6,
-    0x2c48aed7,
-    0x2c492ee6,
-    0x2c49aef3,
-    0x2c4a2f00,
-    0x2c4aaf0d,
-    0x2c4b2f16,
-    0x2c4baf2a,
-    0x2c4c2f39,
-    0x2c4caf47,
-    0x2c4d2f69,
-    0x2c4daf7a,
-    0x2c4e2f8b,
-    0x2c4eaf56,
-    0x2c4f2b68,
+    0xc320540,
+    0xc32854b,
+    0xc330556,
+    0xc338563,
+    0xc34056d,
+    0xc348577,
+    0xc35057e,
+    0xc35858a,
+    0xc360591,
+    0xc3685a7,
+    0xc3705bc,
+    0xc3785cd,
+    0xc3805dd,
+    0xc3885f7,
+    0xc39060c,
+    0xc39861b,
+    0xc3a0634,
+    0xc3a8648,
+    0xc3b0654,
+    0xc3b865b,
+    0xc3c0663,
+    0xc3c8671,
+    0xc3d0679,
+    0xc3d8681,
+    0xc3e068c,
+    0x1032191e,
+    0x10329935,
+    0x1033194e,
+    0x10339964,
+    0x10341974,
+    0x10349987,
+    0x10351995,
+    0x103599a4,
+    0x103619c4,
+    0x103699e3,
+    0x10371a00,
+    0x10379a1d,
+    0x10381a32,
+    0x10389a54,
+    0x10391a73,
+    0x10399a92,
+    0x103a1aa9,
+    0x103a9ac0,
+    0x103b1ac9,
+    0x103b9ad4,
+    0x103c1aee,
+    0x103c9af6,
+    0x103d1afe,
+    0x103d9b05,
+    0x103e1b18,
+    0x103e9b2a,
+    0x103f1b3d,
+    0x103f9b46,
+    0x14320a2f,
+    0x14328a3d,
+    0x14330a49,
+    0x14338a56,
+    0x18361205,
+    0x18371233,
+    0x18379244,
+    0x1838125a,
+    0x1839127d,
+    0x18399292,
+    0x183a12a4,
+    0x183c12e8,
+    0x183c92f6,
+    0x183d1309,
+    0x183d9319,
+    0x183e933f,
+    0x183f1352,
+    0x183f9361,
+    0x1840938b,
+    0x184113f7,
+    0x18419408,
+    0x1842141b,
+    0x1842942d,
+    0x1843143f,
+    0x18439450,
+    0x18441461,
+    0x18449472,
+    0x18451483,
+    0x18459490,
+    0x184614b2,
+    0x184694c5,
+    0x184714d9,
+    0x184794e6,
+    0x184814f5,
+    0x18489504,
+    0x18491515,
+    0x18499531,
+    0x184a153f,
+    0x184a9550,
+    0x184b1561,
+    0x184b956f,
+    0x184c157f,
+    0x184c95a5,
+    0x184d15b4,
+    0x184d95c4,
+    0x184e15d4,
+    0x184e95e3,
+    0x184f1522,
+    0x184f9194,
+    0x18501137,
+    0x1850914f,
+    0x18511171,
+    0x18519183,
+    0x185211b5,
+    0x185291ce,
+    0x185311df,
+    0x185391f5,
+    0x1854121a,
+    0x1854926b,
+    0x185512b4,
+    0x185592c9,
+    0x185612d6,
+    0x1856932e,
+    0x18571371,
+    0x1857937e,
+    0x1858139a,
+    0x185893ab,
+    0x185913bb,
+    0x185993cb,
+    0x185a13da,
+    0x185a93e9,
+    0x185b149e,
+    0x1c320699,
+    0x1c3286a5,
+    0x1c3306b0,
+    0x1c3386bc,
+    0x203215f7,
+    0x20329602,
+    0x2033160a,
+    0x20339616,
+    0x24321622,
+    0x24329630,
+    0x24331642,
+    0x24339651,
+    0x24341664,
+    0x24349677,
+    0x2435168e,
+    0x243596a6,
+    0x243616b4,
+    0x243696cc,
+    0x243716d5,
+    0x243796e7,
+    0x243816fb,
+    0x24389708,
+    0x2439171e,
+    0x24399736,
+    0x243a174e,
+    0x243a9758,
+    0x243b176d,
+    0x243b977b,
+    0x243c1793,
+    0x243c97aa,
+    0x243d17b5,
+    0x243d97c3,
+    0x28320a8f,
+    0x28328a9e,
+    0x28330aa9,
+    0x28338aae,
+    0x28340ab9,
+    0x2c322aa0,
+    0x2c32aaac,
+    0x2c332abf,
+    0x2c33aad0,
+    0x2c342ae9,
+    0x2c34ab11,
+    0x2c352b28,
+    0x2c35ab45,
+    0x2c362b62,
+    0x2c36ab7f,
+    0x2c372b98,
+    0x2c37abb1,
+    0x2c382bc7,
+    0x2c38abd5,
+    0x2c392be7,
+    0x2c39ac04,
+    0x2c3a2c21,
+    0x2c3aac2f,
+    0x2c3b2c4d,
+    0x2c3bac6b,
+    0x2c3c2c86,
+    0x2c3cac9a,
+    0x2c3d2cac,
+    0x2c3dacbc,
+    0x2c3e2cca,
+    0x2c3eacda,
+    0x2c3f2cea,
+    0x2c3fad05,
+    0x2c402d16,
+    0x2c40ad31,
+    0x2c412d45,
+    0x2c41ad58,
+    0x2c422d77,
+    0x2c42ad8b,
+    0x2c432d9e,
+    0x2c43adad,
+    0x2c442dbc,
+    0x2c44add3,
+    0x2c452dee,
+    0x2c45ae06,
+    0x2c462e1a,
+    0x2c46ae2d,
+    0x2c472e3e,
+    0x2c47ae4f,
+    0x2c482e60,
+    0x2c48ae71,
+    0x2c492e80,
+    0x2c49ae8d,
+    0x2c4a2e9a,
+    0x2c4aaea7,
+    0x2c4b2eb0,
+    0x2c4baec4,
+    0x2c4c2ed3,
+    0x2c4caee1,
+    0x2c4d2f03,
+    0x2c4daf14,
+    0x2c4e2f25,
+    0x2c4eaef0,
+    0x2c4f2b02,
     0x30320000,
     0x30328018,
     0x3033002c,
@@ -341,395 +339,390 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x30508404,
     0x30510413,
     0x3051841c,
-    0x343209d6,
-    0x343289e6,
-    0x343309f1,
-    0x343389fe,
-    0x38320a07,
-    0x38328a1f,
-    0x38330a32,
-    0x38338a3c,
-    0x3c320aeb,
-    0x3c328af9,
-    0x3c330b10,
-    0x3c338b24,
-    0x3c340b56,
-    0x3c348b67,
-    0x3c350b73,
-    0x3c358ba0,
-    0x3c360bb2,
-    0x3c368bdb,
-    0x3c370be8,
-    0x3c378bf5,
-    0x3c380c03,
-    0x3c388c10,
-    0x3c390c1d,
-    0x3c398c41,
-    0x3c3a0c51,
-    0x3c3a8c69,
-    0x3c3b0c7e,
-    0x3c3b8c93,
-    0x3c3c0ca0,
-    0x3c3c8cb3,
-    0x3c3d0cc6,
-    0x3c3d8cea,
-    0x3c3e0d12,
-    0x3c3e8d2b,
-    0x3c3f0d41,
-    0x3c3f8d4e,
-    0x3c400d61,
-    0x3c408d72,
-    0x3c410d83,
-    0x3c418d9c,
-    0x3c420db5,
-    0x3c428dcb,
-    0x3c430de8,
-    0x3c438dfe,
-    0x3c440e82,
-    0x3c448ea9,
-    0x3c450ec7,
-    0x3c458ee1,
-    0x3c460ef9,
-    0x3c468f11,
-    0x3c470f3c,
-    0x3c478f67,
-    0x3c480f88,
-    0x3c488fb1,
-    0x3c490fcc,
-    0x3c498ff5,
-    0x3c4a1002,
-    0x3c4a9019,
-    0x3c4b1030,
-    0x3c4b9059,
-    0x3c4c1069,
-    0x3c4c9075,
-    0x3c4d108d,
-    0x3c4d90a0,
-    0x3c4e10b1,
-    0x3c4e90c2,
-    0x3c4f10e8,
-    0x3c4f8adf,
-    0x3c500e1a,
-    0x3c508e3a,
-    0x3c510e67,
-    0x3c518fe7,
-    0x3c5210d2,
-    0x3c528b87,
-    0x3c530b3f,
-    0x40321ba5,
-    0x40329bbf,
-    0x40331be7,
-    0x40339bff,
-    0x40341c1d,
-    0x40349c64,
-    0x40351c7b,
-    0x40359c97,
-    0x40361cb3,
-    0x40369ccd,
-    0x40371cec,
-    0x40379d0b,
-    0x40381d23,
-    0x40389d40,
-    0x40391d63,
-    0x40399d80,
-    0x403a1d9e,
-    0x403a9dae,
-    0x403b1dc3,
-    0x403b9ddf,
-    0x403c1df9,
-    0x403c9e04,
-    0x403d1e27,
-    0x403d9e4b,
-    0x403e1e61,
-    0x403e9e6b,
-    0x403f1e77,
-    0x403f9e88,
-    0x40401ea0,
-    0x40409ea8,
-    0x40411eb1,
-    0x40419eba,
-    0x40421ee2,
-    0x40429ef6,
-    0x40431f01,
-    0x40439f0d,
-    0x40441f61,
-    0x40449f6d,
-    0x40451f7a,
-    0x40459f8d,
-    0x40461fa5,
-    0x40469fbd,
-    0x40471fd3,
-    0x40479fee,
-    0x40482009,
-    0x4048a01d,
-    0x40492036,
-    0x4049a04f,
-    0x404a2069,
-    0x404aa073,
-    0x404b2083,
-    0x404ba0a4,
-    0x404c20bf,
-    0x404ca0cd,
-    0x404d20da,
-    0x404da0ee,
-    0x404e2106,
-    0x404ea114,
-    0x404f213e,
-    0x404fa155,
-    0x40502167,
-    0x4050a198,
-    0x405121c9,
-    0x4051a1de,
-    0x40522201,
-    0x4052a221,
-    0x4053223c,
-    0x4053a24c,
-    0x4054a258,
-    0x4055226e,
-    0x4055a28c,
-    0x40562299,
-    0x4056a2a3,
-    0x405722b1,
-    0x4057a2cc,
-    0x405822e7,
-    0x4058a306,
-    0x4059231b,
-    0x4059a330,
-    0x405a234d,
-    0x405aa361,
-    0x405b237d,
-    0x405ba393,
-    0x405c23b0,
-    0x405ca3c2,
-    0x405d23d9,
-    0x405da3ea,
-    0x405e2406,
-    0x405ea41a,
-    0x405f242a,
-    0x405fa446,
-    0x4060245b,
-    0x4060a471,
-    0x4061248e,
-    0x4061a4a7,
-    0x406224d1,
-    0x4062a4da,
-    0x406324ea,
-    0x4063a523,
-    0x40642539,
-    0x4064a557,
-    0x4065256c,
-    0x4065a589,
-    0x406625a0,
-    0x4066a5be,
-    0x406725db,
-    0x4067a5f2,
-    0x40682610,
-    0x4068a627,
-    0x4069263f,
-    0x4069a650,
-    0x406a2663,
-    0x406aa676,
-    0x406b268a,
-    0x406ba6ae,
-    0x406c26c9,
-    0x406ca6ea,
-    0x406d270e,
-    0x406da729,
-    0x406e274a,
-    0x406ea75f,
-    0x406f2778,
-    0x406fa785,
-    0x40702793,
-    0x4070a7a0,
-    0x407127bd,
-    0x4071a7dd,
-    0x407227f8,
-    0x4072a811,
-    0x40732828,
-    0x4073a842,
-    0x40742866,
-    0x4074a87c,
-    0x40752890,
-    0x4075a8a5,
-    0x407628bf,
-    0x4076a8d1,
-    0x407728e6,
-    0x4077a90c,
-    0x40782929,
-    0x4078a94c,
-    0x40792972,
-    0x4079a98f,
-    0x407a29b2,
-    0x407aa9ce,
-    0x407b29ea,
-    0x407ba9fc,
-    0x407c2a09,
-    0x407e2a16,
-    0x407eaa2c,
-    0x407f2a44,
-    0x407faa57,
-    0x40802a6c,
-    0x4080aa85,
-    0x40812aa3,
-    0x4081aac3,
-    0x40822acc,
-    0x4082aae8,
-    0x40832af1,
-    0x4083a123,
-    0x408421b2,
-    0x4084a182,
-    0x40852512,
-    0x4085a4f6,
-    0x40861c3c,
-    0x40869c4f,
-    0x40871f41,
-    0x40879f50,
-    0x40881bcb,
-    0x40889eca,
-    0x40891f28,
-    0x4089a4ba,
-    0x408a1b70,
-    0x408a9b81,
-    0x408b1b93,
-    0x408ba1ef,
+    0x343209b7,
+    0x343289c7,
+    0x343309d2,
+    0x343389df,
+    0x383209e8,
+    0x38328a00,
+    0x38330a13,
+    0x38338a1d,
+    0x3c320acc,
+    0x3c328ada,
+    0x3c330af1,
+    0x3c338b05,
+    0x3c340b37,
+    0x3c348b48,
+    0x3c350b54,
+    0x3c358b81,
+    0x3c360b93,
+    0x3c368bbc,
+    0x3c370bc9,
+    0x3c378bd6,
+    0x3c380be4,
+    0x3c388bf1,
+    0x3c390bfe,
+    0x3c398c22,
+    0x3c3a0c32,
+    0x3c3a8c4a,
+    0x3c3b0c5f,
+    0x3c3b8c74,
+    0x3c3c0c81,
+    0x3c3c8c94,
+    0x3c3d0ca7,
+    0x3c3d8ccb,
+    0x3c3e0cf3,
+    0x3c3e8d0c,
+    0x3c3f0d22,
+    0x3c3f8d2f,
+    0x3c400d42,
+    0x3c408d53,
+    0x3c410d64,
+    0x3c418d7d,
+    0x3c420d96,
+    0x3c428dac,
+    0x3c430dc9,
+    0x3c438ddf,
+    0x3c440e63,
+    0x3c448e8a,
+    0x3c450ea8,
+    0x3c458ec2,
+    0x3c460eda,
+    0x3c468ef2,
+    0x3c470f1d,
+    0x3c478f48,
+    0x3c480f69,
+    0x3c488f92,
+    0x3c490fad,
+    0x3c498fd6,
+    0x3c4a0fe3,
+    0x3c4a8ffa,
+    0x3c4b1011,
+    0x3c4b903a,
+    0x3c4c104a,
+    0x3c4c9056,
+    0x3c4d106e,
+    0x3c4d9081,
+    0x3c4e1092,
+    0x3c4e90a3,
+    0x3c4f10c9,
+    0x3c4f8ac0,
+    0x3c500dfb,
+    0x3c508e1b,
+    0x3c510e48,
+    0x3c518fc8,
+    0x3c5210b3,
+    0x3c528b68,
+    0x3c530b20,
+    0x40321b51,
+    0x40329b6b,
+    0x40331b93,
+    0x40339bab,
+    0x40341bc9,
+    0x40349c10,
+    0x40351c27,
+    0x40359c43,
+    0x40361c5f,
+    0x40369c79,
+    0x40371c98,
+    0x40379cb7,
+    0x40381ccf,
+    0x40389cec,
+    0x40391d0f,
+    0x40399d2c,
+    0x403a1d4a,
+    0x403a9d5a,
+    0x403b1d6f,
+    0x403b9d8b,
+    0x403c1da5,
+    0x403c9db0,
+    0x403d1dd3,
+    0x403d9df7,
+    0x403e1e0d,
+    0x403e9e17,
+    0x403f1e23,
+    0x403f9e34,
+    0x40401e4c,
+    0x40409e54,
+    0x40411e5d,
+    0x40419e66,
+    0x40421e8e,
+    0x40429ea2,
+    0x40431ead,
+    0x40439eb9,
+    0x40441f0d,
+    0x40449f19,
+    0x40451f26,
+    0x40459f39,
+    0x40461f51,
+    0x40469f69,
+    0x40471f7f,
+    0x40479f9a,
+    0x40481fb5,
+    0x40489fc9,
+    0x40491fe2,
+    0x40499ffb,
+    0x404a2015,
+    0x404aa01f,
+    0x404b202f,
+    0x404ba050,
+    0x404c206b,
+    0x404ca079,
+    0x404d2086,
+    0x404da09a,
+    0x404e20b2,
+    0x404ea0c0,
+    0x404f20ea,
+    0x404fa101,
+    0x40502113,
+    0x4050a144,
+    0x40512175,
+    0x4051a18a,
+    0x4052219b,
+    0x4052a1bb,
+    0x405321d6,
+    0x4053a1e6,
+    0x4054a1f2,
+    0x40552208,
+    0x4055a226,
+    0x40562233,
+    0x4056a23d,
+    0x4057224b,
+    0x4057a266,
+    0x40582281,
+    0x4058a2a0,
+    0x405922b5,
+    0x4059a2ca,
+    0x405a22e7,
+    0x405aa2fb,
+    0x405b2317,
+    0x405ba32d,
+    0x405c234a,
+    0x405ca35c,
+    0x405d2373,
+    0x405da384,
+    0x405e23a0,
+    0x405ea3b4,
+    0x405f23c4,
+    0x405fa3e0,
+    0x406023f5,
+    0x4060a40b,
+    0x40612428,
+    0x4061a441,
+    0x4062246b,
+    0x4062a474,
+    0x40632484,
+    0x4063a4bd,
+    0x406424d3,
+    0x4064a4f1,
+    0x40652506,
+    0x4065a523,
+    0x4066253a,
+    0x4066a558,
+    0x40672575,
+    0x4067a58c,
+    0x406825aa,
+    0x4068a5c1,
+    0x406925d9,
+    0x4069a5ea,
+    0x406a25fd,
+    0x406aa610,
+    0x406b2624,
+    0x406ba648,
+    0x406c2663,
+    0x406ca684,
+    0x406d26a8,
+    0x406da6c3,
+    0x406e26e4,
+    0x406ea6f9,
+    0x406f2712,
+    0x406fa71f,
+    0x4070272d,
+    0x4070a73a,
+    0x40712757,
+    0x4071a777,
+    0x40722792,
+    0x4072a7ab,
+    0x407327c2,
+    0x4073a7dc,
+    0x40742800,
+    0x4074a816,
+    0x4075282a,
+    0x4075a83f,
+    0x40762859,
+    0x4076a86b,
+    0x40772880,
+    0x4077a8a6,
+    0x407828c3,
+    0x4078a8e6,
+    0x4079290c,
+    0x4079a929,
+    0x407a294c,
+    0x407aa968,
+    0x407b2984,
+    0x407ba996,
+    0x407c29a3,
+    0x407e29b0,
+    0x407ea9c6,
+    0x407f29de,
+    0x407fa9f1,
+    0x40802a06,
+    0x4080aa1f,
+    0x40812a3d,
+    0x4081aa5d,
+    0x40822a66,
+    0x4082aa82,
+    0x40832a8b,
+    0x4083a0cf,
+    0x4084215e,
+    0x4084a12e,
+    0x408524ac,
+    0x4085a490,
+    0x40861be8,
+    0x40869bfb,
+    0x40871eed,
+    0x40879efc,
+    0x40881b77,
+    0x40889e76,
+    0x40891ed4,
+    0x4089a454,
     0x4432042a,
     0x4432843c,
     0x44330445,
     0x4433844d,
     0x4434045a,
-    0x44348475,
-    0x44350490,
-    0x443584b0,
-    0x443604cc,
-    0x443684ed,
-    0x443704f4,
-    0x44378502,
-    0x4438050c,
-    0x44388518,
-    0x44390522,
-    0x4439852d,
-    0x443a0537,
-    0x443a8541,
-    0x443b046a,
-    0x4c3217ea,
-    0x4c3297f9,
-    0x4c331808,
-    0x4c339821,
-    0x4c34183c,
-    0x4c349858,
-    0x4c35186a,
-    0x4c359878,
-    0x4c36188d,
-    0x4c36989e,
-    0x4c3718ac,
-    0x4c3798ba,
-    0x4c3818cc,
-    0x4c3898dc,
-    0x4c3918e6,
-    0x4c3998fe,
-    0x4c3a1916,
-    0x4c3a9929,
-    0x50322f9c,
-    0x5032afb1,
-    0x50332fc2,
-    0x5033afd5,
-    0x50342fe6,
-    0x5034aff9,
-    0x50353008,
-    0x5035b01d,
-    0x5036302d,
-    0x5036b03c,
-    0x5037304d,
-    0x5037b05d,
-    0x5038306e,
-    0x5038b081,
-    0x50393093,
-    0x5039b0a9,
-    0x503a30bb,
-    0x503ab0cc,
-    0x503b30dd,
-    0x503bb0ee,
-    0x503c30f9,
-    0x503cb105,
-    0x503d3110,
-    0x503db11b,
-    0x503e3128,
-    0x503eb13d,
-    0x503f314b,
-    0x503fb15f,
-    0x50403172,
-    0x5040b183,
-    0x5041319d,
-    0x5041b1ac,
-    0x504231b5,
-    0x5042b1c4,
-    0x504331d6,
-    0x5043b1e2,
-    0x504431ea,
-    0x5044b1fd,
-    0x5045320e,
-    0x5045b224,
-    0x50463230,
-    0x5046b244,
-    0x50473252,
-    0x5047b266,
-    0x50483280,
-    0x5048b294,
-    0x504932aa,
-    0x5049b2c1,
-    0x504a32d3,
-    0x504ab2e7,
-    0x504b32fc,
-    0x504bb313,
-    0x504c3327,
-    0x504cb330,
-    0x504d3338,
-    0x504db347,
-    0x504e3357,
-    0x68321109,
-    0x6832911a,
-    0x6833112a,
-    0x68339138,
-    0x68341145,
-    0x6c3210f8,
-    0x74320a89,
-    0x74328a9b,
-    0x783206e8,
-    0x7832871b,
-    0x7833072d,
-    0x7833873f,
-    0x78340753,
-    0x78348767,
-    0x78350785,
-    0x78358797,
-    0x783607ab,
-    0x78368819,
-    0x7837082b,
-    0x7837883d,
-    0x7838084f,
-    0x78388866,
-    0x7839087d,
-    0x78398894,
-    0x783a08b0,
-    0x783a88cc,
-    0x783b08e8,
-    0x783b88fe,
-    0x783c0914,
-    0x783c892a,
-    0x783d0947,
-    0x783d8956,
-    0x783e0965,
-    0x783e8974,
-    0x783f0990,
-    0x783f899e,
-    0x784009ac,
-    0x784089ba,
-    0x784109c7,
-    0x784186fa,
-    0x784207bf,
-    0x784287dd,
-    0x784307fb,
-    0x80321611,
+    0x4434846a,
+    0x44350485,
+    0x443584a5,
+    0x443604c1,
+    0x443684e2,
+    0x443704e9,
+    0x443784f7,
+    0x44380501,
+    0x4438850d,
+    0x44390517,
+    0x44398522,
+    0x443a052c,
+    0x443a8536,
+    0x4c3217cb,
+    0x4c3297da,
+    0x4c3317e9,
+    0x4c339802,
+    0x4c34181d,
+    0x4c349839,
+    0x4c35184b,
+    0x4c359859,
+    0x4c36186e,
+    0x4c36987f,
+    0x4c37188d,
+    0x4c37989b,
+    0x4c3818ad,
+    0x4c3898bd,
+    0x4c3918c7,
+    0x4c3998df,
+    0x4c3a18f7,
+    0x4c3a990a,
+    0x50322f36,
+    0x5032af4b,
+    0x50332f5c,
+    0x5033af6f,
+    0x50342f80,
+    0x5034af93,
+    0x50352fa2,
+    0x5035afb7,
+    0x50362fc7,
+    0x5036afd6,
+    0x50372fe7,
+    0x5037aff7,
+    0x50383008,
+    0x5038b01b,
+    0x5039302d,
+    0x5039b043,
+    0x503a3055,
+    0x503ab066,
+    0x503b3077,
+    0x503bb088,
+    0x503c3093,
+    0x503cb09f,
+    0x503d30aa,
+    0x503db0b5,
+    0x503e30c2,
+    0x503eb0d7,
+    0x503f30e5,
+    0x503fb0f9,
+    0x5040310c,
+    0x5040b11d,
+    0x50413137,
+    0x5041b146,
+    0x5042314f,
+    0x5042b15e,
+    0x50433170,
+    0x5043b17c,
+    0x50443184,
+    0x5044b197,
+    0x504531a8,
+    0x5045b1be,
+    0x504631ca,
+    0x5046b1de,
+    0x504731ec,
+    0x5047b200,
+    0x5048321a,
+    0x5048b22e,
+    0x50493244,
+    0x5049b25b,
+    0x504a326d,
+    0x504ab281,
+    0x504b3296,
+    0x504bb2ad,
+    0x504c32c1,
+    0x504cb2ca,
+    0x504d32d2,
+    0x504db2e1,
+    0x504e32f1,
+    0x683210ea,
+    0x683290fb,
+    0x6833110b,
+    0x68339119,
+    0x68341126,
+    0x6c3210d9,
+    0x74320a6a,
+    0x74328a7c,
+    0x783206c9,
+    0x783286fc,
+    0x7833070e,
+    0x78338720,
+    0x78340734,
+    0x78348748,
+    0x78350766,
+    0x78358778,
+    0x7836078c,
+    0x783687fa,
+    0x7837080c,
+    0x7837881e,
+    0x78380830,
+    0x78388847,
+    0x7839085e,
+    0x78398875,
+    0x783a0891,
+    0x783a88ad,
+    0x783b08c9,
+    0x783b88df,
+    0x783c08f5,
+    0x783c890b,
+    0x783d0928,
+    0x783d8937,
+    0x783e0946,
+    0x783e8955,
+    0x783f0971,
+    0x783f897f,
+    0x7840098d,
+    0x7840899b,
+    0x784109a8,
+    0x784186db,
+    0x784207a0,
+    0x784287be,
+    0x784307dc,
+    0x803215f2,
 };
 
 const size_t kOpenSSLFunctionValuesLen = sizeof(kOpenSSLFunctionValues) / sizeof(kOpenSSLFunctionValues[0]);
@@ -804,7 +797,6 @@ const char kOpenSSLFunctionStringData[] =
     "BIO_new\0"
     "BIO_new_file\0"
     "BIO_new_mem_buf\0"
-    "BIO_printf\0"
     "BIO_zero_copy_get_read_buf\0"
     "BIO_zero_copy_get_read_buf_done\0"
     "BIO_zero_copy_get_write_buf\0"
@@ -828,7 +820,6 @@ const char kOpenSSLFunctionStringData[] =
     "BN_exp\0"
     "BN_generate_dsa_nonce\0"
     "BN_generate_prime_ex\0"
-    "BN_lshift\0"
     "BN_mod_exp2_mont\0"
     "BN_mod_exp_mont\0"
     "BN_mod_exp_mont_consttime\0"
@@ -840,7 +831,6 @@ const char kOpenSSLFunctionStringData[] =
     "BN_new\0"
     "BN_rand\0"
     "BN_rand_range\0"
-    "BN_rshift\0"
     "BN_sqrt\0"
     "BN_usub\0"
     "bn_wexpand\0"
@@ -1119,9 +1109,6 @@ const char kOpenSSLFunctionStringData[] =
     "rsa_setup_blinding\0"
     "sign_raw\0"
     "verify_raw\0"
-    "SSL_AEAD_CTX_new\0"
-    "SSL_AEAD_CTX_open\0"
-    "SSL_AEAD_CTX_seal\0"
     "SSL_CTX_check_private_key\0"
     "SSL_CTX_new\0"
     "SSL_CTX_set1_tls_channel_id\0"
@@ -1196,7 +1183,6 @@ const char kOpenSSLFunctionStringData[] =
     "dtls1_process_fragment\0"
     "dtls1_process_record\0"
     "dtls1_read_bytes\0"
-    "dtls1_seal_record\0"
     "dtls1_send_hello_verify_request\0"
     "dtls1_write_app_data_bytes\0"
     "i2d_SSL_SESSION\0"
@@ -1875,7 +1861,6 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x40879bf9,
     0x40880083,
     0x40889fd1,
-    0x40890a0a,
     0x41f42333,
     0x41f923c5,
     0x41fe22b8,
diff --git a/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S b/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S
index 204ee3e..0feeab0 100644
--- a/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S
+++ b/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S
@@ -1366,7 +1366,7 @@ bsaes_ctr32_encrypt_blocks:
 
 	vld1.8	{q0}, [r8]		@ load counter
 #ifdef	__APPLE__
-	mov	r8, #:lower16:(.LREVM0SR-.LM0)
+	mov	r8, #.LREVM0SR-.LM0
 	add	r8, r6, r8
 #else
 	add	r8, r6, #.LREVM0SR-.LM0	@ borrow r8
@@ -1428,7 +1428,7 @@ bsaes_ctr32_encrypt_blocks:
 	mov	r5, r10			@ pass rounds
 	vstmia	r9, {q10}			@ save next counter
 #ifdef	__APPLE__
-	mov	r6, #:lower16:(.LREVM0SR-.LSR)
+	mov	r6, #.LREVM0SR-.LSR
 	sub	r6, r8, r6
 #else
 	sub	r6, r8, #.LREVM0SR-.LSR	@ pass constants