summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-09Snap for 7316203 from 82db6b075aad5fa0b653f445e7035f9c6509c921 to ↵android11-gsiandroid-build-team Robot
rvc-platform-release am: 263eaa4a1d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/14427620 Change-Id: I207a1d2a2c7851b83dae951fd1f549e6b77c0e72
2021-05-04Snap for 7316203 from 82db6b075aad5fa0b653f445e7035f9c6509c921 to ↵android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r40android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android11-platform-releaseandroid-build-team Robot
rvc-platform-release Change-Id: Ieb1784edfeb7e02b9503c5bdd21743f4a71bcfb7
2021-03-31Snap for 7249461 from ac675a6d208e08a031d5bf262fdcdbb533da8425 to ↵android-build-team Robot
rvc-qpr3-release am: 106509aad2 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/14056943 Change-Id: Ibcc94e99396b3927a2a47e6e281000a89a9e8a57
2021-03-31Snap for 7249461 from ac675a6d208e08a031d5bf262fdcdbb533da8425 to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: Ic578f920afa9b0d9b44d588812495e957b869a87
2021-03-18Fix EDIPartyName parsing and GENERAL_NAME_cmp.Pete Bentley
Cherry pick note: Fix for rvc-qpr-dev is required (see bug for details). Note that this branch is code-frozen due to FIPS certification, but my understanding is that security fixes trump that, but that's why I've included the minimal fix from BoringSSL rather than patching the roll-up CL from master in aosp/1553538. See also CVE-2020-1971, f960d81215ebf3f65e03d4d5d857fb9b666d6920, and aa0ad2011d3e7ad8a611da274ef7d9c7706e289b from upstream OpenSSL. Unlike upstream's version, this CL opts for a simpler edipartyname_cmp. GENERAL_NAME_cmp is already unsuitable for ordering, just equality, which means there's no need to preserve return values from ASN1_STRING_cmp. Additionally, the ASN.1 structure implies most fields cannot be NULL. (The change from other to x400Address is a no-op. They're the same type. Just x400Address is a little clearer. Historical quirks of the GENERAL_NAME structure.) Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44404 Bug: 175147055 Test: atest boringssl_crypto_test boringssl_ssl_test Change-Id: Ieffd0cde14d1f93f9ad6a884609ed631b891599b Merged-In: I1fb4105341a73be9d5f978301f7318e16027f37d
2020-12-08Snap for 6948038 from 0c38f71de8290beaa0edcc8f3d63cc8368947add to ↵android-build-team Robot
rvc-platform-release am: 0150bf9ea1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12979069 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a22bb3ce7039ee76d41fd7428e8cbe0056a5d20
2020-11-03Snap for 6948038 from 0c38f71de8290beaa0edcc8f3d63cc8368947add to ↵android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-build-team Robot
rvc-platform-release Change-Id: Iafc8af5a8c4f2e045f1af66654c901b0b9d6597f
2020-10-12Merge branch android11-platform-releaseSzuWei Lin
Change-Id: Id97000d3257adb153f8ed894d38f70266886f802
2020-10-06Merge commit 'b94ec526dc9909546fe74d0c2ce01cb3e0db2691' into HEADYimin Li
Change-Id: Ie51450fa35a6d87db0e270177ed153b67607b142
2020-09-21Snap for 6787936 from 26e3829490066e5bf79076b14207557fa2f69ae6 to ↵android-platform-11.0.0_r2android-platform-11.0.0_r1android-11.0.0_r6android-build-team Robot
rvc-platform-release Change-Id: I376d47613443023daf83e4a9fea31018b6ca6074
2020-08-25[automerger skipped] Disable ASAN for libcrypto. am: 2267f65417 am: ↵Pete Bentley
5fb8f8641f am: d888dac7a3 -s ours am skip reason: Change-Id Iaad8d45fa5f007448e5f81b8864dd687931db270 with SHA-1 2267f65417 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/11440589 Change-Id: I4c449119fadc8cc9d0be162c958fd9232b136113
2020-08-25[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
df4e4d863a am: 13837a386f am: 1e9b3fd01d -s ours am skip reason: Change-Id I880abf1c2e80c76bb6efaa71f530ef18aa86c358 with SHA-1 df4e4d863a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/11263334 Change-Id: I10c2510d9aa128d817c891e0a85d690e261a01fd
2020-08-25[automerger skipped] Set apex_available property am: 53d5f9f81a am: ↵Jiyong Park
8aa8efee20 am: c1f0121056 -s ours am skip reason: Change-Id Id1a8a62b3213cf73b1f3a20846f70ead02b30fcc with SHA-1 53d5f9f81a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/11103638 Change-Id: I20e7b7fc7ed2bddc9db0fc0a14f091010d92a42a
2020-08-25[automerger skipped] Set apex_available property am: eb9e618c70 am: ↵Jiyong Park
1c40a69cc8 am: 6b3ffff66b -s ours am skip reason: Change-Id I1fc4aca9841f5a6d750522eca36ed75c723f3f2a with SHA-1 eb9e618c70 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/11103637 Change-Id: Ib7d3b92795b6b0e0081abba45a5b47b199e742b5
2020-07-09Snap for 6664334 from 6453437eccb35caf51fc06c3b333994a1925bffd to ↵android-build-team Robot
rvc-release am: 0b4ad5e5d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12113621 Change-Id: I447285e87475eef129cca6beae8f1b8f39fbc719
2020-07-09Snap for 6664334 from 6453437eccb35caf51fc06c3b333994a1925bffd to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid-build-team Robot
Change-Id: I22d9c432a0791d7e5db6f082f23685dbf9bdfc3d
2020-07-08Snap for 6663666 from b8e66a8dff92ab0019d0d506208a92de3a3e197d to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid-build-team Robot
rvc-qpr1-release Change-Id: I441186a0665b2ec3a538d2d09cf4597aaa8ada91
2020-07-08Link libcrypto with -Bsymbolic. am: 6453437ecc am: e864986f14android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr2-releaseandroid11-qpr1-c-releasePete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886 Change-Id: I29bd6e8d896b4277002b139f843e2ad86dd080f8
2020-07-08Link libcrypto with -Bsymbolic. am: 6453437eccandroid-11.0.0_r16android11-d1-b-releasePete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886 Change-Id: I5b94dad6c729b4888c1849ad2b83c01f9efd16fd
2020-07-08Link libcrypto with -Bsymbolic.android11-devPete Bentley
Prevents crypto-related symbols from being resolved from libraries earlier in the search path and e.g. breaking the FIPS integrity checks. Bug: 160231064 Test: m && flashall Change-Id: I9c9f7139f518770b4553e89d91f9a69aa700478e (cherry picked from commit 1e9e5857536942a4cc097a38d4331e27c4172d00)
2020-05-13Snap for 6488384 from 2267f65417a0b43437ad56f6321e87308cb5e421 to ↵android-build-team Robot
rvc-release am: 726ff1665a Change-Id: Id0dbee3aea9025904a061afd43882040187dd6c9
2020-05-13Snap for 6488384 from 2267f65417a0b43437ad56f6321e87308cb5e421 to rvc-releaseandroid-build-team Robot
Change-Id: Ic5fc76b258b9648fa95b8e92073f03d706e1977d
2020-05-12Disable ASAN for libcrypto. am: 2267f65417 am: 5fb8f8641fPete Bentley
Change-Id: Ic09f3624612b516e1ebd75db8d86495f178ae965
2020-05-12Disable ASAN for libcrypto. am: 2267f65417Pete Bentley
Change-Id: I72f85516413648217ce95e294f439780d632bcda
2020-05-12Disable ASAN for libcrypto.Pete Bentley
If address sanitizing is enabled, libcrypto will not report itself as being in FIPS mode, which causes boringssl_self_test to fail putting the device into a boot loop. Rather than risk modifying libcrypto or boringssl_self_test, this disables ASAN for libcrypto. HWASAN is unaffacted and still available for use with libcrypto. The BoringSSL team do extensive ASAN testing so the risk of this change masking bugs is low. Bug: 154681903 Test: Build and boot with SANITIZE_TARGET=address Change-Id: Iaad8d45fa5f007448e5f81b8864dd687931db270 Merged-In: Iaad8d45fa5f007448e5f81b8864dd687931db270 (cherry picked from commit e0c3f631710669d25e542b82ad8faaa08f36adf3)
2020-04-28Snap for 6436225 from df4e4d863a5bd4a61da448bc7c17b4ce82f577af to rvc-releaseandroid-build-team Robot
Change-Id: I85057a841fe3ba3bb0afe465505954f98a6a167d
2020-04-27Set min_sdk_version to be part of mainline modules am: df4e4d863a am: 13837a386fJooyung Han
Change-Id: Ie72bc792b58307c40314bb5d11fe051e3d8fd6d3
2020-04-27Set min_sdk_version to be part of mainline modules am: df4e4d863aJooyung Han
Change-Id: I2dca71d13ca74d56c538f946ee5b3a2b3eb7cfe3
2020-04-27Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I880abf1c2e80c76bb6efaa71f530ef18aa86c358 Change-Id: I880abf1c2e80c76bb6efaa71f530ef18aa86c358 (cherry picked from commit 856ad1d402002ab72041989b0ec878afd9e576f9)
2020-04-22Snap for 6416172 from 53d5f9f81ae2d4a65218bef88706296e57b0a977 to rvc-releaseandroid-build-team Robot
Change-Id: I5a84d4513b8a35a0687db337f3df62ef326af4e9
2020-04-21Set apex_available property am: 53d5f9f81a am: 8aa8efee20Jiyong Park
Change-Id: I0a8233a544d2a33637cb4c3621664881dfbcbed2
2020-04-21Set apex_available property am: eb9e618c70 am: 1c40a69cc8Jiyong Park
Change-Id: I10dedbc1722a89230e4a39d45c3e091968aa7f0f
2020-04-21Set apex_available property am: 53d5f9f81aJiyong Park
Change-Id: Iac05d51993d97f476d8724eeafba1b095077ca73
2020-04-21Set apex_available property am: eb9e618c70Jiyong Park
Change-Id: I927858672e84da51ddfd44ae7fdc69368ec40dea
2020-04-20Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick from AOSP Bug: 150999716 Test: m Merged-In: Id1a8a62b3213cf73b1f3a20846f70ead02b30fcc (cherry picked from commit d87b59064910a08b879f168bb5105fb93ac9bdff) Change-Id: Id1a8a62b3213cf73b1f3a20846f70ead02b30fcc
2020-04-20Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 150999716 Test: m Merged-In: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a (cherry picked from commit 0dcd4e8262f521f08a8302051ad6c81489f05754) Change-Id: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a
2020-02-13Snap for 6203617 from 7d27d5062a7f328b72022bac0b9ac9f39c5db2e5 to rvc-releaseandroid-build-team Robot
Change-Id: Icdc3d2349835e8497d3c0ac56c862230c2dc2d5a
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 am: 0e2a6be6fe am: ab577713e9 Change-Id: Ica5f7b525f409c8d21cbab9eb9b9b17ceee34388
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 am: 0e2a6be6fe Change-Id: I5e2bce85083ba3efdb382fc495235dcd6348f1ef
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 Change-Id: I6db3d8fbc6e26faf44c4da6e7f458239a8b5ac4d
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks."Przemyslaw Szczepaniak
2020-02-12Make libcrypto_static apex-available for com.android.neuralnetworks.Przemyslaw Szczepaniak
Test: coral-userdebug build Bug: 148593574 Change-Id: I22076d876894db060cb8fef0c1fd21bdac521cd1
2020-02-12Snap for 6199579 from 358ad874f48d8714630808ed8dfc37b2f86139bb to rvc-releaseandroid-build-team Robot
Change-Id: I093a47eecbadda9b1cb03e52383c6beea6e8e970
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250f am: 905d1bd434 am: ↵Automerger Merge Worker
9d3e8b016a Change-Id: I062f5a9083fbb396b43b9ab444a9c0159774b445
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250f am: 905d1bd434Automerger Merge Worker
Change-Id: I4bedc131ae3d8c8ea73b534c3d8140bfea3e9064
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250fAutomerger Merge Worker
Change-Id: Iefe389cadf329ff3f7e96c98ec45cc8e457a3e02
2020-02-10Set apex_available for libssl, libcrypto.Joshua Duong
Bug: 149181583 Bug: 111434128 Bug: 147364041 Test: make Change-Id: I7a9a239210b786c6d914908626f06be720573b8c
2020-02-05Snap for 6182732 from ad28e8522b35b8a9548086cb8ef5415681fb17d4 to rvc-releaseandroid-build-team Robot
Change-Id: If308e42ff390d508a8dde3e8413011549c2795b1
2020-02-04Make libcrypto_static visible to frameworks/ml/nn/common libraries. am: ↵Automerger Merge Worker
243d9d538d am: f4628633bc am: a6f93aefc6 Change-Id: I17cefe849b77b0b49f7ce906b25d5a60bef07797
2020-02-04Make libcrypto_static visible to frameworks/ml/nn/common libraries. am: ↵Automerger Merge Worker
243d9d538d am: f4628633bc Change-Id: I8a7381bf5cafcfb100e526224cb639c9ef3d4648
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 12:13:13 +0000