Roll src/third_party/boringssl/src/ to de24aadc5bc01130b6a9d25582203bb5308fabe1.

$ git log 7e8f2baeb..de24aadc5 --date=short --format='%ad %ae %s'
2015-06-30 davidben Add RAND_set_urandom_fd.
2015-06-25 davidben Move the session ticket functions to ssl.h.
2015-06-16 davidben Promote SSL_CTX_[gs]et_tlsext_ticket_keys to functions.
2015-06-16 davidben Sort the preprocessor compatibility section.
2015-06-16 davidben Increment the reference count of sessions inside the lock.
2015-06-16 davidben Add a test for the ticket callback.
2015-06-15 davidben Remove EVP_PKEY_HMAC.
2015-06-24 agl RAND_set_rand_method takes a const parameter.
2015-06-24 mab Dummy |RAND_set_rand_method|, |RAND_egd|, and |RAND_SSLeay|.
2015-05-18 mab Restore |DES_ede3_cfb_encrypt| and |DES_ede3_cfb64_encrypt| from OpenSSL at ce7e647b.
2015-06-23 agl Fix signed/unsigned warnings for MSVC.
2015-06-23 mab Restore |X509_REQ_print| and friends, from OpenSSL at ce7e647b.
2015-06-23 agl Add missing comma in .type pragma for rdrand code.
2015-06-17 mab Restore |ERR_print_errors()|.
2015-06-17 mab Restore |RSA_generate_key()| from OpenSSL at b4f0d1a.
2015-06-17 mab Restore |BIO_f_base64| from OpenSSL at b4f0d1a, modulo style fixes.
2015-06-22 agl Emit #if guards for ARM assembly files.
2015-06-19 alangley Handle RDRAND failures.
2015-06-22 davidben AEADs don't go through ENGINE.
2015-06-22 mab dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key.
2015-06-22 whesse Give generated assembly files different names for arm and aarch64.
2015-06-18 agl bssl_shim: move large buffer to heap.
2015-06-18 agl Add a GCM test with non-standard nonce length.
2015-06-18 agl Suggest building at Android API level 16.

BUG=none

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

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

19 files changed, 457 insertions, 300 deletions

diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi
index 808280d..fb8e643 100644
--- a/third_party/boringssl/boringssl.gypi
+++ b/third_party/boringssl/boringssl.gypi
@@ -165,8 +165,6 @@
       'src/crypto/evp/p_dsa_asn1.c',
       'src/crypto/evp/p_ec.c',
       'src/crypto/evp/p_ec_asn1.c',
-      'src/crypto/evp/p_hmac.c',
-      'src/crypto/evp/p_hmac_asn1.c',
       'src/crypto/evp/p_rsa.c',
       'src/crypto/evp/p_rsa_asn1.c',
       'src/crypto/evp/pbkdf.c',
@@ -231,6 +229,7 @@
       'src/crypto/x509/i2d_pr.c',
       'src/crypto/x509/pkcs7.c',
       'src/crypto/x509/t_crl.c',
+      'src/crypto/x509/t_req.c',
       'src/crypto/x509/t_x509.c',
       'src/crypto/x509/t_x509a.c',
       'src/crypto/x509/x509.c',
@@ -303,19 +302,19 @@
       'src/crypto/x509v3/v3_utl.c',
     ],
     'boringssl_linux_aarch64_sources': [
-      'linux-aarch64/crypto/aes/aesv8-armx.S',
-      'linux-aarch64/crypto/modes/ghashv8-armx.S',
+      'linux-aarch64/crypto/aes/aesv8-armx64.S',
+      'linux-aarch64/crypto/modes/ghashv8-armx64.S',
       'linux-aarch64/crypto/sha/sha1-armv8.S',
       'linux-aarch64/crypto/sha/sha256-armv8.S',
       'linux-aarch64/crypto/sha/sha512-armv8.S',
     ],
     'boringssl_linux_arm_sources': [
       'linux-arm/crypto/aes/aes-armv4.S',
-      'linux-arm/crypto/aes/aesv8-armx.S',
+      'linux-arm/crypto/aes/aesv8-armx32.S',
       'linux-arm/crypto/aes/bsaes-armv7.S',
       'linux-arm/crypto/bn/armv4-mont.S',
       'linux-arm/crypto/modes/ghash-armv4.S',
-      'linux-arm/crypto/modes/ghashv8-armx.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',
diff --git a/third_party/boringssl/err_data.c b/third_party/boringssl/err_data.c
index 2eca1e0..27acc89 100644
--- a/third_party/boringssl/err_data.c
+++ b/third_party/boringssl/err_data.c
@@ -219,65 +219,67 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x28330ac8,
     0x28338acd,
     0x28340ad8,
-    0x2c322b5b,
-    0x2c32ab67,
-    0x2c332b7a,
-    0x2c33ab8b,
-    0x2c342ba4,
-    0x2c34abcc,
-    0x2c352be3,
-    0x2c35ac00,
-    0x2c362c1d,
-    0x2c36ac3a,
-    0x2c372c53,
-    0x2c37ac6c,
-    0x2c382c82,
-    0x2c38ac90,
-    0x2c392ca2,
-    0x2c39acbf,
-    0x2c3a2cdc,
-    0x2c3aacea,
-    0x2c3b2d08,
-    0x2c3bad26,
-    0x2c3c2d41,
-    0x2c3cad55,
-    0x2c3d2d67,
-    0x2c3dad77,
-    0x2c3e2d85,
-    0x2c3ead95,
-    0x2c3f2da5,
-    0x2c3fadc0,
-    0x2c402dd1,
-    0x2c40adec,
-    0x2c412e00,
-    0x2c41ae13,
-    0x2c422e32,
-    0x2c42ae46,
-    0x2c432e59,
-    0x2c43ae68,
-    0x2c442e77,
-    0x2c44ae8e,
-    0x2c452ea9,
-    0x2c45aec1,
-    0x2c462ed5,
-    0x2c46aee8,
-    0x2c472ef9,
-    0x2c47af0a,
-    0x2c482f1b,
-    0x2c48af2c,
-    0x2c492f3b,
-    0x2c49af48,
-    0x2c4a2f55,
-    0x2c4aaf62,
-    0x2c4b2f6b,
-    0x2c4baf7f,
-    0x2c4c2f8e,
-    0x2c4caf9c,
-    0x2c4d2fbe,
-    0x2c4dafcf,
-    0x2c4e2fe0,
-    0x2c4eafab,
-    0x2c4f2bbd,
+    0x2c322b99,
+    0x2c32aba5,
+    0x2c332bb8,
+    0x2c33abc9,
+    0x2c342be2,
+    0x2c34ac0a,
+    0x2c352c21,
+    0x2c35ac3e,
+    0x2c362c5b,
+    0x2c36ac78,
+    0x2c372c91,
+    0x2c37acaa,
+    0x2c382cc0,
+    0x2c38acce,
+    0x2c392ce0,
+    0x2c39acfd,
+    0x2c3a2d1a,
+    0x2c3aad28,
+    0x2c3b2d46,
+    0x2c3bad64,
+    0x2c3c2d7f,
+    0x2c3cad93,
+    0x2c3d2da5,
+    0x2c3dadb5,
+    0x2c3e2dc3,
+    0x2c3eadd3,
+    0x2c3f2de3,
+    0x2c3fae22,
+    0x2c402e33,
+    0x2c40ae4e,
+    0x2c412e62,
+    0x2c41ae75,
+    0x2c422e94,
+    0x2c42aea8,
+    0x2c432ebb,
+    0x2c43aeca,
+    0x2c442ed9,
+    0x2c44aef0,
+    0x2c452f0b,
+    0x2c45af23,
+    0x2c462f37,
+    0x2c46af4a,
+    0x2c472f5b,
+    0x2c47af6c,
+    0x2c482f7d,
+    0x2c48af8e,
+    0x2c492f9d,
+    0x2c49afaa,
+    0x2c4a2fb7,
+    0x2c4aafc4,
+    0x2c4b2fcd,
+    0x2c4bafe1,
+    0x2c4c2ff0,
+    0x2c4caffe,
+    0x2c4d3020,
+    0x2c4db031,
+    0x2c4e3042,
+    0x2c4eb00d,
+    0x2c4f2bfb,
+    0x2c4fadfe,
+    0x2c502e10,
     0x30320000,
     0x30328018,
     0x3033002c,
@@ -418,184 +420,186 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x3c528b87,
     0x3c530b3f,
     0x40321bb9,
-    0x40329bd3,
-    0x40331bfb,
-    0x40339c13,
-    0x40341c31,
-    0x40349c78,
-    0x40351c8f,
-    0x40359cab,
-    0x40361cc7,
-    0x40369ce1,
-    0x40371d00,
-    0x40379d1f,
-    0x40381d37,
-    0x40389d54,
-    0x40391d77,
-    0x40399d94,
-    0x403a1dc9,
-    0x403a9e23,
-    0x403b1e38,
-    0x403b9e54,
-    0x403c1e6e,
-    0x403c9e79,
-    0x403d1e9c,
-    0x403d9ec0,
-    0x403e1ed6,
-    0x403e9ee0,
-    0x403f1eec,
-    0x403f9efd,
-    0x40401f15,
-    0x40409f1d,
-    0x40411f26,
-    0x40419f2f,
-    0x40421f57,
-    0x40429f6b,
-    0x40431f76,
-    0x40439f82,
-    0x40441fd6,
-    0x40449fe2,
-    0x40451fef,
-    0x4045a002,
-    0x4046201a,
-    0x4046a032,
-    0x40472048,
-    0x4047a063,
-    0x4048207e,
-    0x4048a092,
-    0x404920ab,
-    0x4049a0c4,
-    0x404a20de,
-    0x404aa0e8,
-    0x404b1deb,
-    0x404b9e0a,
-    0x404c20f8,
-    0x404ca106,
-    0x404d2113,
-    0x404da127,
-    0x404e213f,
-    0x404ea14d,
-    0x404f2177,
-    0x404fa18e,
-    0x405021a0,
-    0x4050a1d1,
-    0x40512202,
-    0x4051a217,
-    0x4052223a,
-    0x4052a25a,
-    0x4053226f,
-    0x4053a27f,
-    0x4054a28b,
-    0x405522a1,
-    0x4055a2e1,
-    0x405622ee,
-    0x4056a2f8,
-    0x40572306,
-    0x4057a321,
-    0x4058233c,
-    0x4058a35b,
-    0x40592370,
-    0x4059a385,
-    0x405a23a2,
-    0x405aa3b6,
-    0x405b23d2,
-    0x405ba3e8,
-    0x405c2405,
-    0x405ca417,
-    0x405d242e,
-    0x405da43f,
-    0x405e245b,
-    0x405ea46f,
-    0x405f247f,
-    0x405fa49b,
-    0x406024b0,
-    0x4060a4c6,
-    0x406124e3,
-    0x4061a4fc,
-    0x40622526,
-    0x4062a52f,
-    0x4063253f,
-    0x4063a578,
-    0x4064258e,
-    0x4064a5ac,
-    0x406525c1,
-    0x4065a5de,
-    0x406625f5,
-    0x4066a613,
-    0x40672630,
-    0x4067a647,
-    0x40682665,
-    0x4068a67c,
-    0x40692694,
-    0x4069a6a5,
-    0x406a26b8,
-    0x406aa6cb,
-    0x406b26df,
-    0x406ba703,
-    0x406c271e,
-    0x406ca73f,
-    0x406d2763,
-    0x406da77e,
-    0x406e279f,
-    0x406ea7b4,
-    0x406f27cd,
-    0x406fa7da,
-    0x407027e8,
-    0x4070a7f5,
-    0x40712812,
-    0x4071a832,
-    0x4072284d,
-    0x4072a866,
-    0x4073287d,
-    0x4073a897,
-    0x407428bb,
-    0x4074a8d1,
-    0x407528e5,
-    0x4075a8fa,
-    0x40762914,
-    0x4076a926,
-    0x4077293b,
-    0x4077a961,
-    0x4078297e,
-    0x4078a9a1,
-    0x407929c7,
-    0x4079a9e4,
-    0x407a2a07,
-    0x407aaa23,
-    0x407b2a3f,
-    0x407baa51,
-    0x407c2a5e,
-    0x407e2a6b,
-    0x407eaa81,
-    0x407f2a99,
-    0x407faaac,
-    0x40802ac1,
-    0x4080aada,
-    0x40812af8,
-    0x4081ab18,
-    0x40822b21,
-    0x4082ab3d,
-    0x40832b46,
-    0x4083a15c,
-    0x408421eb,
-    0x4084a1bb,
-    0x40852567,
-    0x4085a54b,
-    0x40861c50,
-    0x40869c63,
-    0x40871fb6,
-    0x40879fc5,
-    0x40881bdf,
-    0x40889f3f,
-    0x40891f9d,
-    0x4089a50f,
+    0x40329bf2,
+    0x40331c1a,
+    0x40339c32,
+    0x40341c50,
+    0x40349cb6,
+    0x40351ccd,
+    0x40359ce9,
+    0x40361d05,
+    0x40369d1f,
+    0x40371d3e,
+    0x40379d5d,
+    0x40381d75,
+    0x40389d92,
+    0x40391db5,
+    0x40399dd2,
+    0x403a1e07,
+    0x403a9e61,
+    0x403b1e76,
+    0x403b9e92,
+    0x403c1eac,
+    0x403c9eb7,
+    0x403d1eda,
+    0x403d9efe,
+    0x403e1f14,
+    0x403e9f1e,
+    0x403f1f2a,
+    0x403f9f3b,
+    0x40401f53,
+    0x40409f5b,
+    0x40411f64,
+    0x40419f6d,
+    0x40421f95,
+    0x40429fa9,
+    0x40431fb4,
+    0x40439fc0,
+    0x40442014,
+    0x4044a020,
+    0x4045202d,
+    0x4045a040,
+    0x40462058,
+    0x4046a070,
+    0x40472086,
+    0x4047a0a1,
+    0x404820bc,
+    0x4048a0d0,
+    0x404920e9,
+    0x4049a102,
+    0x404a211c,
+    0x404aa126,
+    0x404b1e29,
+    0x404b9e48,
+    0x404c2136,
+    0x404ca144,
+    0x404d2151,
+    0x404da165,
+    0x404e217d,
+    0x404ea18b,
+    0x404f21b5,
+    0x404fa1cc,
+    0x405021de,
+    0x4050a20f,
+    0x40512240,
+    0x4051a255,
+    0x40522278,
+    0x4052a298,
+    0x405322ad,
+    0x4053a2bd,
+    0x4054a2c9,
+    0x405522df,
+    0x4055a31f,
+    0x4056232c,
+    0x4056a336,
+    0x40572344,
+    0x4057a35f,
+    0x4058237a,
+    0x4058a399,
+    0x405923ae,
+    0x4059a3c3,
+    0x405a23e0,
+    0x405aa3f4,
+    0x405b2410,
+    0x405ba426,
+    0x405c2443,
+    0x405ca455,
+    0x405d246c,
+    0x405da47d,
+    0x405e2499,
+    0x405ea4ad,
+    0x405f24bd,
+    0x405fa4d9,
+    0x406024ee,
+    0x4060a504,
+    0x40612521,
+    0x4061a53a,
+    0x40622564,
+    0x4062a56d,
+    0x4063257d,
+    0x4063a5b6,
+    0x406425cc,
+    0x4064a5ea,
+    0x406525ff,
+    0x4065a61c,
+    0x40662633,
+    0x4066a651,
+    0x4067266e,
+    0x4067a685,
+    0x406826a3,
+    0x4068a6ba,
+    0x406926d2,
+    0x4069a6e3,
+    0x406a26f6,
+    0x406aa709,
+    0x406b271d,
+    0x406ba741,
+    0x406c275c,
+    0x406ca77d,
+    0x406d27a1,
+    0x406da7bc,
+    0x406e27dd,
+    0x406ea7f2,
+    0x406f280b,
+    0x406fa818,
+    0x40702826,
+    0x4070a833,
+    0x40712850,
+    0x4071a870,
+    0x4072288b,
+    0x4072a8a4,
+    0x407328bb,
+    0x4073a8d5,
+    0x407428f9,
+    0x4074a90f,
+    0x40752923,
+    0x4075a938,
+    0x40762952,
+    0x4076a964,
+    0x40772979,
+    0x4077a99f,
+    0x407829bc,
+    0x4078a9df,
+    0x40792a05,
+    0x4079aa22,
+    0x407a2a45,
+    0x407aaa61,
+    0x407b2a7d,
+    0x407baa8f,
+    0x407c2a9c,
+    0x407e2aa9,
+    0x407eaabf,
+    0x407f2ad7,
+    0x407faaea,
+    0x40802aff,
+    0x4080ab18,
+    0x40812b36,
+    0x4081ab56,
+    0x40822b5f,
+    0x4082ab7b,
+    0x40832b84,
+    0x4083a19a,
+    0x40842229,
+    0x4084a1f9,
+    0x408525a5,
+    0x4085a589,
+    0x40861c8e,
+    0x40869ca1,
+    0x40871ff4,
+    0x4087a003,
+    0x40881bfe,
+    0x40889f7d,
+    0x40891fdb,
+    0x4089a54d,
     0x408a1b84,
     0x408a9b95,
     0x408b1ba7,
-    0x408ba228,
-    0x408c1db2,
-    0x408c9dd9,
-    0x408d22bf,
+    0x408ba266,
+    0x408c1df0,
+    0x408c9e17,
+    0x408d22fd,
+    0x408d9bd3,
+    0x408e1c6f,
     0x4432042a,
     0x4432843c,
     0x44330445,
@@ -633,63 +637,63 @@ const uint32_t kOpenSSLFunctionValues[] = {
     0x4c3998fe,
     0x4c3a1916,
     0x4c3a9929,
-    0x50322ff1,
-    0x5032b006,
-    0x50333017,
-    0x5033b02a,
-    0x5034303b,
-    0x5034b04e,
-    0x5035305d,
-    0x5035b072,
-    0x50363082,
-    0x5036b091,
-    0x503730a2,
-    0x5037b0b2,
-    0x503830c3,
-    0x5038b0d6,
-    0x503930e8,
-    0x5039b0fe,
-    0x503a3110,
-    0x503ab121,
-    0x503b3132,
-    0x503bb143,
-    0x503c314e,
-    0x503cb15a,
-    0x503d3165,
-    0x503db170,
-    0x503e317d,
-    0x503eb192,
-    0x503f31a0,
-    0x503fb1b4,
-    0x504031c7,
-    0x5040b1d8,
-    0x504131f2,
-    0x5041b201,
-    0x5042320a,
-    0x5042b219,
-    0x5043322b,
-    0x5043b237,
-    0x5044323f,
-    0x5044b252,
-    0x50453263,
-    0x5045b279,
-    0x50463285,
-    0x5046b299,
-    0x504732a7,
-    0x5047b2bb,
-    0x504832d5,
-    0x5048b2e9,
-    0x504932ff,
-    0x5049b316,
-    0x504a3328,
-    0x504ab33c,
-    0x504b3351,
-    0x504bb368,
-    0x504c337c,
-    0x504cb385,
-    0x504d338d,
-    0x504db39c,
-    0x504e33ac,
+    0x50323053,
+    0x5032b068,
+    0x50333079,
+    0x5033b08c,
+    0x5034309d,
+    0x5034b0b0,
+    0x503530bf,
+    0x5035b0d4,
+    0x503630e4,
+    0x5036b0f3,
+    0x50373104,
+    0x5037b114,
+    0x50383125,
+    0x5038b138,
+    0x5039314a,
+    0x5039b160,
+    0x503a3172,
+    0x503ab183,
+    0x503b3194,
+    0x503bb1a5,
+    0x503c31b0,
+    0x503cb1bc,
+    0x503d31c7,
+    0x503db1d2,
+    0x503e31df,
+    0x503eb1f4,
+    0x503f3202,
+    0x503fb216,
+    0x50403229,
+    0x5040b23a,
+    0x50413254,
+    0x5041b263,
+    0x5042326c,
+    0x5042b27b,
+    0x5043328d,
+    0x5043b299,
+    0x504432a1,
+    0x5044b2b4,
+    0x504532c5,
+    0x5045b2db,
+    0x504632e7,
+    0x5046b2fb,
+    0x50473309,
+    0x5047b31d,
+    0x50483337,
+    0x5048b34b,
+    0x50493361,
+    0x5049b378,
+    0x504a338a,
+    0x504ab39e,
+    0x504b33b3,
+    0x504bb3ca,
+    0x504c33de,
+    0x504cb3e7,
+    0x504d33ef,
+    0x504db3fe,
+    0x504e340e,
     0x68321109,
     0x6832911a,
     0x6833112a,
@@ -1128,11 +1132,13 @@ const char kOpenSSLFunctionStringData[] =
     "SSL_AEAD_CTX_open\0"
     "SSL_AEAD_CTX_seal\0"
     "SSL_CTX_check_private_key\0"
+    "SSL_CTX_get_tlsext_ticket_keys\0"
     "SSL_CTX_new\0"
     "SSL_CTX_set1_tls_channel_id\0"
     "SSL_CTX_set_cipher_list\0"
     "SSL_CTX_set_cipher_list_tls11\0"
     "SSL_CTX_set_session_id_context\0"
+    "SSL_CTX_set_tlsext_ticket_keys\0"
     "SSL_CTX_set_tmp_dh\0"
     "SSL_CTX_set_tmp_ecdh\0"
     "SSL_CTX_use_PrivateKey\0"
@@ -1331,6 +1337,8 @@ const char kOpenSSLFunctionStringData[] =
     "X509_PUBKEY_get\0"
     "X509_PUBKEY_set\0"
     "X509_REQ_check_private_key\0"
+    "X509_REQ_print_ex\0"
+    "X509_REQ_print_fp\0"
     "X509_REQ_to_X509\0"
     "X509_STORE_CTX_get1_issuer\0"
     "X509_STORE_CTX_init\0"
diff --git a/third_party/boringssl/linux-aarch64/crypto/aes/aesv8-armx.S b/third_party/boringssl/linux-aarch64/crypto/aes/aesv8-armx64.S
index 9c63291..c414476 100644
--- a/third_party/boringssl/linux-aarch64/crypto/aes/aesv8-armx.S
+++ b/third_party/boringssl/linux-aarch64/crypto/aes/aesv8-armx64.S
@@ -1,3 +1,4 @@
+#if defined(__aarch64__)
 #include "arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
@@ -747,3 +748,4 @@ aes_v8_ctr32_encrypt_blocks:
 	ret
 .size	aes_v8_ctr32_encrypt_blocks,.-aes_v8_ctr32_encrypt_blocks
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx.S b/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S
index ad19074..a0a9b68 100644
--- a/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx.S
+++ b/third_party/boringssl/linux-aarch64/crypto/modes/ghashv8-armx64.S
@@ -1,3 +1,4 @@
+#if defined(__aarch64__)
 #include "arm_arch.h"
 
 .text
@@ -228,3 +229,4 @@ gcm_ghash_v8:
 .byte	71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2
 .align	2
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-aarch64/crypto/sha/sha1-armv8.S b/third_party/boringssl/linux-aarch64/crypto/sha/sha1-armv8.S
index ab6aa98..487a497 100644
--- a/third_party/boringssl/linux-aarch64/crypto/sha/sha1-armv8.S
+++ b/third_party/boringssl/linux-aarch64/crypto/sha/sha1-armv8.S
@@ -1,3 +1,4 @@
+#if defined(__aarch64__)
 #include "arm_arch.h"
 
 .text
@@ -1211,3 +1212,4 @@ sha1_block_armv8:
 .align	2
 .align	2
 .comm	OPENSSL_armcap_P,4,4
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-aarch64/crypto/sha/sha256-armv8.S b/third_party/boringssl/linux-aarch64/crypto/sha/sha256-armv8.S
index ec572e9..4834553 100644
--- a/third_party/boringssl/linux-aarch64/crypto/sha/sha256-armv8.S
+++ b/third_party/boringssl/linux-aarch64/crypto/sha/sha256-armv8.S
@@ -1,3 +1,4 @@
+#if defined(__aarch64__)
 #include "arm_arch.h"
 
 .text
@@ -1141,3 +1142,4 @@ sha256_block_armv8:
 	ret
 .size	sha256_block_armv8,.-sha256_block_armv8
 .comm	OPENSSL_armcap_P,4,4
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-aarch64/crypto/sha/sha512-armv8.S b/third_party/boringssl/linux-aarch64/crypto/sha/sha512-armv8.S
index 8fc342a..654c473 100644
--- a/third_party/boringssl/linux-aarch64/crypto/sha/sha512-armv8.S
+++ b/third_party/boringssl/linux-aarch64/crypto/sha/sha512-armv8.S
@@ -1,3 +1,4 @@
+#if defined(__aarch64__)
 #include "arm_arch.h"
 
 .text
@@ -1021,3 +1022,4 @@ sha512_block_data_order:
 .align	2
 .align	2
 .comm	OPENSSL_armcap_P,4,4
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S b/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S
index 1135020..cb94841 100644
--- a/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S
+++ b/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -1196,3 +1197,4 @@ _armv4_AES_decrypt:
 .align	2
 
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/aes/aesv8-armx.S b/third_party/boringssl/linux-arm/crypto/aes/aesv8-armx32.S
index 006300c..6f0ee7d 100644
--- a/third_party/boringssl/linux-arm/crypto/aes/aesv8-armx.S
+++ b/third_party/boringssl/linux-arm/crypto/aes/aesv8-armx32.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 #include "arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
@@ -752,3 +753,4 @@ aes_v8_ctr32_encrypt_blocks:
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,pc}
 .size	aes_v8_ctr32_encrypt_blocks,.-aes_v8_ctr32_encrypt_blocks
 #endif
+#endif
\ No newline at end of file
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..dd84f35 100644
--- a/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S
+++ b/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -2575,3 +2576,4 @@ bsaes_xts_decrypt:
 .size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
 #endif
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S b/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S
index 81dcbeb..68dfb2c 100644
--- a/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S
+++ b/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 #include "arm_arch.h"
 
 .text
@@ -585,3 +586,4 @@ bn_mul8x_mont_neon:
 .comm	OPENSSL_armcap_P,4,4
 .hidden	OPENSSL_armcap_P
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S b/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S
index b6c7e9b..c6f025d 100644
--- a/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S
+++ b/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S
@@ -1,4 +1,5 @@
 #if defined(__arm__)
+#if defined(__arm__)
 #include "arm_arch.h"
 
 .syntax	unified
@@ -537,3 +538,4 @@ gcm_ghash_neon:
 .align	2
 
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/modes/ghashv8-armx.S b/third_party/boringssl/linux-arm/crypto/modes/ghashv8-armx32.S
index 71913fb..bdbbae9 100644
--- a/third_party/boringssl/linux-arm/crypto/modes/ghashv8-armx.S
+++ b/third_party/boringssl/linux-arm/crypto/modes/ghashv8-armx32.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 #include "arm_arch.h"
 
 .text
@@ -229,3 +230,4 @@ gcm_ghash_v8:
 .byte	71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2
 .align	2
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S b/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S
index 52c99bf..4911458 100644
--- a/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S
+++ b/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 #include "arm_arch.h"
 
 .text
@@ -1458,3 +1459,4 @@ sha1_block_data_order_armv8:
 .comm	OPENSSL_armcap_P,4,4
 .hidden	OPENSSL_armcap_P
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S b/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S
index 114aa43..ac9f2f1 100644
--- a/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S
+++ b/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -2814,3 +2815,4 @@ sha256_block_data_order_armv8:
 .comm	OPENSSL_armcap_P,4,4
 .hidden	OPENSSL_armcap_P
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S b/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S
index 1a3d467..c794f87 100644
--- a/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S
+++ b/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -1865,3 +1866,4 @@ sha512_block_data_order_neon:
 .comm	OPENSSL_armcap_P,4,4
 .hidden	OPENSSL_armcap_P
 #endif
+#endif
\ No newline at end of file
diff --git a/third_party/boringssl/linux-x86_64/crypto/rand/rdrand-x86_64.S b/third_party/boringssl/linux-x86_64/crypto/rand/rdrand-x86_64.S
index 622ae55..94aab9c 100644
--- a/third_party/boringssl/linux-x86_64/crypto/rand/rdrand-x86_64.S
+++ b/third_party/boringssl/linux-x86_64/crypto/rand/rdrand-x86_64.S
@@ -1,11 +1,48 @@
 #if defined(__x86_64__)
 .text	
 
+
+
+
 .globl	CRYPTO_rdrand
 .hidden CRYPTO_rdrand
 .type	CRYPTO_rdrand,@function
 .align	16
 CRYPTO_rdrand:
-.byte	0x48, 0x0f, 0xc7, 0xf0
+	xorq	%rax,%rax
+
+
+.byte	0x48, 0x0f, 0xc7, 0xf1
+
+	adcq	%rax,%rax
+	movq	%rcx,0(%rdi)
+	.byte	0xf3,0xc3
+
+
+
+
+
+.globl	CRYPTO_rdrand_multiple8_buf
+.hidden CRYPTO_rdrand_multiple8_buf
+.type	CRYPTO_rdrand_multiple8_buf,@function
+.align	16
+CRYPTO_rdrand_multiple8_buf:
+	testq	%rsi,%rsi
+	jz	.Lout
+	movq	$8,%rdx
+.Lloop:
+
+
+.byte	0x48, 0x0f, 0xc7, 0xf1
+	jnc	.Lerr
+	movq	%rcx,0(%rdi)
+	addq	%rdx,%rdi
+	subq	%rdx,%rsi
+	jnz	.Lloop
+.Lout:
+	movq	$1,%rax
+	.byte	0xf3,0xc3
+.Lerr:
+	xorq	%rax,%rax
 	.byte	0xf3,0xc3
 #endif
diff --git a/third_party/boringssl/mac-x86_64/crypto/rand/rdrand-x86_64.S b/third_party/boringssl/mac-x86_64/crypto/rand/rdrand-x86_64.S
index 1ba990f..f0df296 100644
--- a/third_party/boringssl/mac-x86_64/crypto/rand/rdrand-x86_64.S
+++ b/third_party/boringssl/mac-x86_64/crypto/rand/rdrand-x86_64.S
@@ -1,11 +1,48 @@
 #if defined(__x86_64__)
 .text	
 
+
+
+
 .globl	_CRYPTO_rdrand
 .private_extern _CRYPTO_rdrand
 
 .p2align	4
 _CRYPTO_rdrand:
-.byte	0x48, 0x0f, 0xc7, 0xf0
+	xorq	%rax,%rax
+
+
+.byte	0x48, 0x0f, 0xc7, 0xf1
+
+	adcq	%rax,%rax
+	movq	%rcx,0(%rdi)
+	.byte	0xf3,0xc3
+
+
+
+
+
+.globl	_CRYPTO_rdrand_multiple8_buf
+.private_extern _CRYPTO_rdrand_multiple8_buf
+
+.p2align	4
+_CRYPTO_rdrand_multiple8_buf:
+	testq	%rsi,%rsi
+	jz	L$out
+	movq	$8,%rdx
+L$loop:
+
+
+.byte	0x48, 0x0f, 0xc7, 0xf1
+	jnc	L$err
+	movq	%rcx,0(%rdi)
+	addq	%rdx,%rdi
+	subq	%rdx,%rsi
+	jnz	L$loop
+L$out:
+	movq	$1,%rax
+	.byte	0xf3,0xc3
+L$err:
+	xorq	%rax,%rax
 	.byte	0xf3,0xc3
 #endif
diff --git a/third_party/boringssl/win-x86_64/crypto/rand/rdrand-x86_64.asm b/third_party/boringssl/win-x86_64/crypto/rand/rdrand-x86_64.asm
index a63ea69..4c03791 100644
--- a/third_party/boringssl/win-x86_64/crypto/rand/rdrand-x86_64.asm
+++ b/third_party/boringssl/win-x86_64/crypto/rand/rdrand-x86_64.asm
@@ -5,6 +5,9 @@ default	rel
 section	.text code align=64
 
 
+
+
+
 global	CRYPTO_rdrand
 
 ALIGN	16
@@ -16,7 +19,52 @@ $L$SEH_begin_CRYPTO_rdrand:
 	mov	rdi,rcx
 
 
-DB	0x48,0x0f,0xc7,0xf0
+	xor	rax,rax
+
+
+DB	0x48,0x0f,0xc7,0xf1
+
+	adc	rax,rax
+	mov	QWORD[rdi],rcx
+	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
+	mov	rsi,QWORD[16+rsp]
+	DB	0F3h,0C3h		;repret
+
+
+
+
+
+global	CRYPTO_rdrand_multiple8_buf
+
+ALIGN	16
+CRYPTO_rdrand_multiple8_buf:
+	mov	QWORD[8+rsp],rdi	;WIN64 prologue
+	mov	QWORD[16+rsp],rsi
+	mov	rax,rsp
+$L$SEH_begin_CRYPTO_rdrand_multiple8_buf:
+	mov	rdi,rcx
+	mov	rsi,rdx
+
+
+	test	rsi,rsi
+	jz	NEAR $L$out
+	mov	rdx,8
+$L$loop:
+
+
+DB	0x48,0x0f,0xc7,0xf1
+	jnc	NEAR $L$err
+	mov	QWORD[rdi],rcx
+	add	rdi,rdx
+	sub	rsi,rdx
+	jnz	NEAR $L$loop
+$L$out:
+	mov	rax,1
+	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
+	mov	rsi,QWORD[16+rsp]
+	DB	0F3h,0C3h		;repret
+$L$err:
+	xor	rax,rax
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret