Commit a6156dea authored by David Benjamin's avatar David Benjamin Committed by Commit Bot

Roll src/third_party/boringssl/src a673d0245..1607f54fe

https://boringssl.googlesource.com/boringssl/+log/a673d02458b1b7d897084266b93d5c610e36bd17..1607f54fed72c6589d560254626909a64124f091

The following commits have update notes:
  40f49428d Reland "Check AlgorithmIdentifier parameters for RSA and ECDSA signatures.""

Bug: none
Change-Id: I57e009feeec8b4220e7d2c0fafbed8a1cb3d934d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521079
Commit-Queue: David Benjamin <davidben@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: default avatarSteven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824544}
parent 3de603ce
......@@ -233,7 +233,7 @@ vars = {
#
# Note this revision should be updated with
# third_party/boringssl/roll_boringssl.py, not roll-dep.
'boringssl_revision': 'a673d02458b1b7d897084266b93d5c610e36bd17',
'boringssl_revision': '1607f54fed72c6589d560254626909a64124f091',
# 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.
......
......@@ -99,6 +99,7 @@ crypto_test_data = [
"src/crypto/cipher_extra/test/aes_128_ccm_bluetooth_8_tests.txt",
"src/crypto/cipher_extra/test/aes_128_ccm_bluetooth_tests.txt",
"src/crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt",
"src/crypto/cipher_extra/test/aes_128_gcm_randnonce_tests.txt",
"src/crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt",
"src/crypto/cipher_extra/test/aes_128_gcm_tests.txt",
"src/crypto/cipher_extra/test/aes_192_gcm_tests.txt",
......@@ -107,6 +108,7 @@ crypto_test_data = [
"src/crypto/cipher_extra/test/aes_256_cbc_sha256_tls_tests.txt",
"src/crypto/cipher_extra/test/aes_256_cbc_sha384_tls_tests.txt",
"src/crypto/cipher_extra/test/aes_256_ctr_hmac_sha256.txt",
"src/crypto/cipher_extra/test/aes_256_gcm_randnonce_tests.txt",
"src/crypto/cipher_extra/test/aes_256_gcm_siv_tests.txt",
"src/crypto/cipher_extra/test/aes_256_gcm_tests.txt",
"src/crypto/cipher_extra/test/chacha20_poly1305_tests.txt",
......
......@@ -192,47 +192,47 @@ const uint32_t kOpenSSLReasonValues[] = {
0x283480ac,
0x283500ea,
0x28358c6c,
0x2c323095,
0x2c3230ce,
0x2c3292f2,
0x2c3330a3,
0x2c33b0b5,
0x2c3430c9,
0x2c34b0db,
0x2c3530f6,
0x2c35b108,
0x2c363138,
0x2c3330dc,
0x2c33b0ee,
0x2c343102,
0x2c34b114,
0x2c35312f,
0x2c35b141,
0x2c363171,
0x2c36832d,
0x2c373145,
0x2c37b171,
0x2c383196,
0x2c38b1ad,
0x2c3931cb,
0x2c39b1db,
0x2c3a31ed,
0x2c3ab201,
0x2c3b3212,
0x2c3bb231,
0x2c37317e,
0x2c37b1aa,
0x2c3831cf,
0x2c38b1e6,
0x2c393204,
0x2c39b214,
0x2c3a3226,
0x2c3ab23a,
0x2c3b324b,
0x2c3bb26a,
0x2c3c1304,
0x2c3c931a,
0x2c3d3245,
0x2c3d327e,
0x2c3d9333,
0x2c3e3262,
0x2c3eb270,
0x2c3f3288,
0x2c3fb2a0,
0x2c4032ca,
0x2c3e329b,
0x2c3eb2a9,
0x2c3f32c1,
0x2c3fb2d9,
0x2c403303,
0x2c409205,
0x2c4132db,
0x2c41b2ee,
0x2c413314,
0x2c41b327,
0x2c4211cb,
0x2c42b2ff,
0x2c42b338,
0x2c430722,
0x2c43b223,
0x2c443184,
0x2c44b2ad,
0x2c45311b,
0x2c45b157,
0x2c4631bb,
0x2c43b25c,
0x2c4431bd,
0x2c44b2e6,
0x2c453154,
0x2c45b190,
0x2c4631f4,
0x30320000,
0x30328015,
0x3033001f,
......@@ -367,246 +367,248 @@ const uint32_t kOpenSSLReasonValues[] = {
0x3c418d67,
0x3c420e73,
0x3c428dfd,
0x4032197b,
0x40329991,
0x403319bf,
0x403399c9,
0x403419e0,
0x403499fe,
0x40351a0e,
0x40359a20,
0x40361a2d,
0x40369a39,
0x40371a4e,
0x40379a60,
0x40381a6b,
0x40389a7d,
0x40321997,
0x403299ad,
0x403319db,
0x403399e5,
0x403419fc,
0x40349a1a,
0x40351a2a,
0x40359a3c,
0x40361a49,
0x40369a55,
0x40371a6a,
0x40379a7c,
0x40381a87,
0x40389a99,
0x40390f27,
0x40399a8d,
0x403a1aa0,
0x403a9ac1,
0x403b1ad2,
0x403b9ae2,
0x40399aa9,
0x403a1abc,
0x403a9add,
0x403b1aee,
0x403b9afe,
0x403c0064,
0x403c8083,
0x403d1b43,
0x403d9b59,
0x403e1b68,
0x403e9ba0,
0x403f1bba,
0x403f9be2,
0x40401bf7,
0x40409c0b,
0x40411c46,
0x40419c61,
0x40421c7a,
0x40429c8d,
0x40431ca1,
0x40439cb9,
0x40441cd0,
0x403d1b5f,
0x403d9b75,
0x403e1b84,
0x403e9bbc,
0x403f1bd6,
0x403f9bfe,
0x40401c13,
0x40409c27,
0x40411c62,
0x40419c7d,
0x40421c96,
0x40429ca9,
0x40431cbd,
0x40439cd5,
0x40441cec,
0x404480ac,
0x40451ce5,
0x40459cf7,
0x40461d1b,
0x40469d3b,
0x40471d49,
0x40479d70,
0x40481de1,
0x40489e14,
0x40491e2b,
0x40499e45,
0x404a1e5c,
0x404a9e7a,
0x404b1e92,
0x404b9ebf,
0x404c1ed5,
0x404c9ee7,
0x404d1f08,
0x404d9f41,
0x404e1f55,
0x404e9f62,
0x404f1fa9,
0x404f9fef,
0x40502046,
0x4050a05a,
0x4051208d,
0x405220aa,
0x4052a0ce,
0x405320e6,
0x4053a0f9,
0x4054210e,
0x4054a131,
0x4055213f,
0x4055a17c,
0x40562189,
0x4056a1a2,
0x405721ba,
0x4057a1cd,
0x405821e2,
0x4058a209,
0x40592238,
0x4059a265,
0x405a2279,
0x405aa289,
0x405b22a1,
0x405ba2b2,
0x405c22c5,
0x405ca304,
0x405d2311,
0x405da336,
0x405e2374,
0x40451d01,
0x40459d13,
0x40461d37,
0x40469d57,
0x40471d65,
0x40479d8c,
0x40481dfd,
0x40489e30,
0x40491e47,
0x40499e61,
0x404a1e78,
0x404a9e96,
0x404b1eae,
0x404b9edb,
0x404c1ef1,
0x404c9f03,
0x404d1f24,
0x404d9f5d,
0x404e1f71,
0x404e9f7e,
0x404f1fc5,
0x404fa00b,
0x40502062,
0x4050a076,
0x405120a9,
0x405220c6,
0x4052a0ea,
0x40532102,
0x4053a115,
0x4054212a,
0x4054a14d,
0x40552178,
0x4055a1b5,
0x405621c2,
0x4056a1db,
0x405721f3,
0x4057a206,
0x4058221b,
0x4058a242,
0x40592271,
0x4059a29e,
0x405a22b2,
0x405aa2c2,
0x405b22da,
0x405ba2eb,
0x405c22fe,
0x405ca33d,
0x405d234a,
0x405da36f,
0x405e23ad,
0x405e8ab3,
0x405f2395,
0x405fa3a2,
0x406023b0,
0x4060a3d2,
0x40612433,
0x4061a46b,
0x40622482,
0x4062a493,
0x406324e0,
0x4063a4f5,
0x4064250c,
0x4064a538,
0x40652553,
0x4065a56a,
0x40662582,
0x4066a5ac,
0x406725d7,
0x4067a61c,
0x40682664,
0x4068a685,
0x406926b7,
0x4069a6e5,
0x406a2706,
0x406aa726,
0x406b28ae,
0x406ba8d1,
0x406c28e7,
0x406cabd8,
0x406d2c07,
0x406dac2f,
0x406e2c5d,
0x406eacaa,
0x406f2d03,
0x406fad3b,
0x40702d4e,
0x4070ad6b,
0x405f23ce,
0x405fa3db,
0x406023e9,
0x4060a40b,
0x4061246c,
0x4061a4a4,
0x406224bb,
0x4062a4cc,
0x40632519,
0x4063a52e,
0x40642545,
0x4064a571,
0x4065258c,
0x4065a5a3,
0x406625bb,
0x4066a5e5,
0x40672610,
0x4067a655,
0x4068269d,
0x4068a6be,
0x406926f0,
0x4069a71e,
0x406a273f,
0x406aa75f,
0x406b28e7,
0x406ba90a,
0x406c2920,
0x406cac11,
0x406d2c40,
0x406dac68,
0x406e2c96,
0x406eace3,
0x406f2d3c,
0x406fad74,
0x40702d87,
0x4070ada4,
0x40710802,
0x4071ad7d,
0x40722d90,
0x4072adc6,
0x40732dde,
0x4071adb6,
0x40722dc9,
0x4072adff,
0x40732e17,
0x40739504,
0x40742df2,
0x4074ae0c,
0x40752e1d,
0x4075ae31,
0x40762e3f,
0x40742e2b,
0x4074ae45,
0x40752e56,
0x4075ae6a,
0x40762e78,
0x407692c8,
0x40772e64,
0x4077ae86,
0x40782ea1,
0x4078aeda,
0x40792ef1,
0x4079af07,
0x407a2f33,
0x407aaf46,
0x407b2f5b,
0x407baf6d,
0x407c2f9e,
0x407cafa7,
0x407d26a0,
0x407d9fff,
0x407e2eb6,
0x407ea219,
0x407f1d5d,
0x407f9ea9,
0x40801fb9,
0x40809d85,
0x408120bc,
0x40819f93,
0x40822c48,
0x40829aee,
0x408321f4,
0x4083a51d,
0x40841d99,
0x4084a251,
0x408522d6,
0x4085a3fa,
0x40862356,
0x4086a019,
0x40872c8e,
0x4087a448,
0x40881b2c,
0x4088a62f,
0x40891b7b,
0x40899b08,
0x408a291f,
0x40772e9d,
0x4077aebf,
0x40782eda,
0x4078af13,
0x40792f2a,
0x4079af40,
0x407a2f6c,
0x407aaf7f,
0x407b2f94,
0x407bafa6,
0x407c2fd7,
0x407cafe0,
0x407d26d9,
0x407da01b,
0x407e2eef,
0x407ea252,
0x407f1d79,
0x407f9ec5,
0x40801fd5,
0x40809da1,
0x408120d8,
0x40819faf,
0x40822c81,
0x40829b0a,
0x4083222d,
0x4083a556,
0x40841db5,
0x4084a28a,
0x4085230f,
0x4085a433,
0x4086238f,
0x4086a035,
0x40872cc7,
0x4087a481,
0x40881b48,
0x4088a668,
0x40891b97,
0x40899b24,
0x408a2958,
0x408a991c,
0x408b2f82,
0x408bad18,
0x408c22e6,
0x408c9938,
0x408d1dfa,
0x408d9dcb,
0x408e1f2a,
0x408ea15c,
0x408f2643,
0x408fa416,
0x409025f8,
0x4090a328,
0x40912907,
0x4091995e,
0x40921bc8,
0x4092acc9,
0x40932da9,
0x4093a02a,
0x40941dad,
0x4094a938,
0x409524a4,
0x4095af13,
0x40962c75,
0x40969fd2,
0x40972075,
0x40979f79,
0x40981c28,
0x4098a4b8,
0x40992ce5,
0x4099a09d,
0x41f427d9,
0x41f9286b,
0x41fe275e,
0x41feaa14,
0x41ff2b29,
0x420327f2,
0x42082814,
0x4208a850,
0x42092742,
0x4209a88a,
0x420a2799,
0x420aa779,
0x420b27b9,
0x420ba832,
0x420c2b45,
0x420ca948,
0x420d29fb,
0x420daa32,
0x42122a4c,
0x42172b0c,
0x4217aa8e,
0x421c2ab0,
0x421f2a6b,
0x42212bbd,
0x42262aef,
0x422b2b9b,
0x422ba9d6,
0x422c2b7d,
0x422ca989,
0x422d2962,
0x422dab5c,
0x422e29b5,
0x42302acb,
0x408b2fbb,
0x408bad51,
0x408c231f,
0x408c9954,
0x408d1e16,
0x408d9de7,
0x408e1f46,
0x408ea195,
0x408f267c,
0x408fa44f,
0x40902631,
0x4090a361,
0x40912940,
0x4091997a,
0x40921be4,
0x4092ad02,
0x40932de2,
0x4093a046,
0x40941dc9,
0x4094a971,
0x409524dd,
0x4095af4c,
0x40962cae,
0x40969fee,
0x40972091,
0x40979f95,
0x40981c44,
0x4098a4f1,
0x40992d1e,
0x4099a0b9,
0x409a215b,
0x409a9938,
0x41f42812,
0x41f928a4,
0x41fe2797,
0x41feaa4d,
0x41ff2b62,
0x4203282b,
0x4208284d,
0x4208a889,
0x4209277b,
0x4209a8c3,
0x420a27d2,
0x420aa7b2,
0x420b27f2,
0x420ba86b,
0x420c2b7e,
0x420ca981,
0x420d2a34,
0x420daa6b,
0x42122a85,
0x42172b45,
0x4217aac7,
0x421c2ae9,
0x421f2aa4,
0x42212bf6,
0x42262b28,
0x422b2bd4,
0x422baa0f,
0x422c2bb6,
0x422ca9c2,
0x422d299b,
0x422dab95,
0x422e29ee,
0x42302b04,
0x4432072d,
0x4432873c,
0x44330748,
......@@ -661,69 +663,69 @@ const uint32_t kOpenSSLReasonValues[] = {
0x4c411561,
0x4c4193e4,
0x4c42154d,
0x50323311,
0x5032b320,
0x5033332b,
0x5033b33b,
0x50343354,
0x5034b36e,
0x5035337c,
0x5035b392,
0x503633a4,
0x5036b3ba,
0x503733d3,
0x5037b3e6,
0x503833fe,
0x5038b40f,
0x50393424,
0x5039b438,
0x503a3458,
0x503ab46e,
0x503b3486,
0x503bb498,
0x503c34b4,
0x503cb4cb,
0x503d34e4,
0x503db4fa,
0x503e3507,
0x503eb51d,
0x503f352f,
0x5032334a,
0x5032b359,
0x50333364,
0x5033b374,
0x5034338d,
0x5034b3a7,
0x503533b5,
0x5035b3cb,
0x503633dd,
0x5036b3f3,
0x5037340c,
0x5037b41f,
0x50383437,
0x5038b448,
0x5039345d,
0x5039b471,
0x503a3491,
0x503ab4a7,
0x503b34bf,
0x503bb4d1,
0x503c34ed,
0x503cb504,
0x503d351d,
0x503db533,
0x503e3540,
0x503eb556,
0x503f3568,
0x503f837b,
0x50403542,
0x5040b552,
0x5041356c,
0x5041b57b,
0x50423595,
0x5042b5b2,
0x504335c2,
0x5043b5d2,
0x504435e1,
0x5040357b,
0x5040b58b,
0x504135a5,
0x5041b5b4,
0x504235ce,
0x5042b5eb,
0x504335fb,
0x5043b60b,
0x5044361a,
0x50448431,
0x504535f5,
0x5045b613,
0x50463626,
0x5046b63c,
0x5047364e,
0x5047b663,
0x50483689,
0x5048b697,
0x504936aa,
0x5049b6bf,
0x504a36d5,
0x504ab6e5,
0x504b3705,
0x504bb718,
0x504c373b,
0x504cb769,
0x504d377b,
0x504db798,
0x504e37b3,
0x504eb7cf,
0x504f37e1,
0x504fb7f8,
0x50503807,
0x5045362e,
0x5045b64c,
0x5046365f,
0x5046b675,
0x50473687,
0x5047b69c,
0x504836c2,
0x5048b6d0,
0x504936e3,
0x5049b6f8,
0x504a370e,
0x504ab71e,
0x504b373e,
0x504bb751,
0x504c3774,
0x504cb7a2,
0x504d37b4,
0x504db7d1,
0x504e37ec,
0x504eb808,
0x504f381a,
0x504fb831,
0x50503840,
0x505086f1,
0x5051381a,
0x50513853,
0x58320f65,
0x68320f27,
0x68328c7f,
......@@ -767,19 +769,19 @@ const uint32_t kOpenSSLReasonValues[] = {
0x7c3211e1,
0x803213f7,
0x80328083,
0x80333064,
0x8033309d,
0x803380ac,
0x80343073,
0x8034afdb,
0x80352ff9,
0x8035b087,
0x8036303b,
0x8036afea,
0x8037302d,
0x8037afc8,
0x8038304e,
0x8038b00a,
0x8039301f,
0x803430ac,
0x8034b014,
0x80353032,
0x8035b0c0,
0x80363074,
0x8036b023,
0x80373066,
0x8037b001,
0x80383087,
0x8038b043,
0x80393058,
};
const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
......@@ -1113,6 +1115,7 @@ const char kOpenSSLReasonStringData[] =
"VALUE_MISSING\0"
"WRONG_SIGNATURE_LENGTH\0"
"ALPN_MISMATCH_ON_EARLY_DATA\0"
"ALPS_MISMATCH_ON_EARLY_DATA\0"
"APPLICATION_DATA_INSTEAD_OF_HANDSHAKE\0"
"APPLICATION_DATA_ON_SHUTDOWN\0"
"APP_DATA_IN_HANDSHAKE\0"
......@@ -1204,6 +1207,7 @@ const char kOpenSSLReasonStringData[] =
"MISSING_TMP_ECDH_KEY\0"
"MIXED_SPECIAL_OPERATOR_WITH_GROUPS\0"
"MTU_TOO_SMALL\0"
"NEGOTIATED_ALPS_WITHOUT_ALPN\0"
"NEGOTIATED_BOTH_NPN_AND_ALPN\0"
"NEGOTIATED_TB_WITHOUT_EMS_OR_RI\0"
"NESTED_GROUP\0"
......
......@@ -248,6 +248,7 @@ Ldec_key_abort:
#endif
.align 5
_aes_hw_encrypt:
AARCH64_VALID_CALL_TARGET
ldr r3,[r2,#240]
vld1.32 {q0},[r2]!
vld1.8 {q2},[r0]
......@@ -280,6 +281,7 @@ Loop_enc:
#endif
.align 5
_aes_hw_decrypt:
AARCH64_VALID_CALL_TARGET
ldr r3,[r2,#240]
vld1.32 {q0},[r2]!
vld1.8 {q2},[r0]
......
......@@ -25,6 +25,7 @@
#endif
.align 4
_gcm_init_v8:
AARCH64_VALID_CALL_TARGET
vld1.64 {q9},[r1] @ load input H
vmov.i8 q11,#0xe1
vshl.i64 q11,q11,#57 @ 0xc2.0
......@@ -78,6 +79,7 @@ _gcm_init_v8:
#endif
.align 4
_gcm_gmult_v8:
AARCH64_VALID_CALL_TARGET
vld1.64 {q9},[r0] @ load Xi
vmov.i8 q11,#0xe1
vld1.64 {q12,q13},[r1] @ load twisted H, ...
......@@ -122,6 +124,7 @@ _gcm_gmult_v8:
#endif
.align 4
_gcm_ghash_v8:
AARCH64_VALID_CALL_TARGET
vstmdb sp!,{d8,d9,d10,d11,d12,d13,d14,d15} @ 32-bit ABI says so
vld1.64 {q0},[r0] @ load [rotated] Xi
@ "[rotated]" means that
......
......@@ -243,6 +243,7 @@ aes_hw_set_decrypt_key:
.type aes_hw_encrypt,%function
.align 5
aes_hw_encrypt:
AARCH64_VALID_CALL_TARGET
ldr r3,[r2,#240]
vld1.32 {q0},[r2]!
vld1.8 {q2},[r0]
......@@ -273,6 +274,7 @@ aes_hw_encrypt:
.type aes_hw_decrypt,%function
.align 5
aes_hw_decrypt:
AARCH64_VALID_CALL_TARGET
ldr r3,[r2,#240]
vld1.32 {q0},[r2]!
vld1.8 {q2},[r0]
......
......@@ -24,6 +24,7 @@
.type gcm_init_v8,%function
.align 4
gcm_init_v8:
AARCH64_VALID_CALL_TARGET
vld1.64 {q9},[r1] @ load input H
vmov.i8 q11,#0xe1
vshl.i64 q11,q11,#57 @ 0xc2.0
......@@ -75,6 +76,7 @@ gcm_init_v8:
.type gcm_gmult_v8,%function
.align 4
gcm_gmult_v8:
AARCH64_VALID_CALL_TARGET
vld1.64 {q9},[r0] @ load Xi
vmov.i8 q11,#0xe1
vld1.64 {q12,q13},[r1] @ load twisted H, ...
......@@ -117,6 +119,7 @@ gcm_gmult_v8:
.type gcm_ghash_v8,%function
.align 4
gcm_ghash_v8:
AARCH64_VALID_CALL_TARGET
vstmdb sp!,{d8,d9,d10,d11,d12,d13,d14,d15} @ 32-bit ABI says so
vld1.64 {q0},[r0] @ load [rotated] Xi
@ "[rotated]" means that
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment