summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-14Snap for 7362376 from 2ffc8c9e1e954e0d392cc3d96c248763bfa77938 to ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android12--mainline-releaseandroid-build-team Robot
sc-mainline-release Change-Id: I4ef196b0ee0a3cbf16aba3bde80db93b6adb8251
2021-05-13[automerger skipped] Merge "Add visibility for packages/Connectivity tests" ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devRemi NGUYEN VAN
am: 2b8eb1f62a am: 73bad426b3 am: 04e8de7696 -s ours am skip reason: Merged-In I2609e140fb4130c7d5bcfc206342811450d50037 with SHA-1 c73cb6ce50 is already in history Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1705384 Change-Id: I68a7bdeeb483dfc9b3a50b1e6fadbc980500761f
2021-05-13Merge "Add visibility for packages/Connectivity tests" am: 2b8eb1f62a am: ↵Remi NGUYEN VAN
73bad426b3 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1705384 Change-Id: I47693f7169a0ead74a532ff43ae9947c52ac4d46
2021-05-13Merge "Add visibility for packages/Connectivity tests" am: 2b8eb1f62aRemi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1705384 Change-Id: If79426d808d2e4727663ca10aa7b0f283f74fdc8
2021-05-13Merge "Add visibility for packages/Connectivity tests"android-s-beta-2android-s-beta-1Remi NGUYEN VAN
2021-05-13Add visibility for packages/Connectivity testsRemi NGUYEN VAN
The tests are moved from frameworks/base/tests/net to frameworks/base/packages/Connectivity/tests, so they can be moved to packages/modules/Connectivity/tests together with the rest of the module. Add visibility for the new locations. Test: m Bug: 186628461 Merged-In: I2609e140fb4130c7d5bcfc206342811450d50037 (clean cherry-pick) Change-Id: I2609e140fb4130c7d5bcfc206342811450d50037
2021-05-11Add visibility for packages/Connectivity testsRemi NGUYEN VAN
The tests are moved from frameworks/base/tests/net to frameworks/base/packages/Connectivity/tests, so they can be moved to packages/modules/Connectivity/tests together with the rest of the module. Add visibility for the new locations. Test: m Bug: 186628461 Change-Id: I2609e140fb4130c7d5bcfc206342811450d50037
2021-03-11Merge "Do not accept null password in PKCS12KeyStoreSpi#engineStore." am: ↵Almaz Mingaleev
28da8c1313 am: b4d2aa4fad am: 07ef9e0b31 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1622887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4680afa52638dab0713bcc3bec06a00538698df4
2021-03-11Merge "Do not accept null password in PKCS12KeyStoreSpi#engineStore." am: ↵Almaz Mingaleev
28da8c1313 am: b4d2aa4fad Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1622887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iedc9a809028959f37973a49af78f2aa310b2875a
2021-03-11Merge "Do not accept null password in PKCS12KeyStoreSpi#engineStore." am: ↵Almaz Mingaleev
28da8c1313 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1622887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1d71c8d319c214f56f5979e32708c3c3b78d6a4
2021-03-11Merge "Do not accept null password in PKCS12KeyStoreSpi#engineStore."Almaz Mingaleev
2021-03-10Do not accept null password in PKCS12KeyStoreSpi#engineStore.Almaz Mingaleev
android.keystore.cts.KeyStoreTest verifies that NPE is thrown on null password. Android followed that behaviour historically, but during upgrade to 1.68 upstream version was applied. Bug: 179780002 Bug: 181339859 Test: CtsLibcoreTestCases Test: CtsWhycheProofTestCases Test: CtsLibcoreOkHttpTestCases Test: MtsConscryptTestCases Change-Id: I47c4d25ae3237e6580d5d1afcd731a87962028d0
2021-03-09Merge "Adding RemoteProvisioner tests to visibility" am: 4a8421509d am: ↵Max Bires
b3a42b50a8 am: f123be3b8e Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1614006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idcaf34c1a0b5705bc4c43575920fa574cc6ccf60
2021-03-09Merge "Adding RemoteProvisioner tests to visibility" am: 4a8421509d am: ↵Max Bires
b3a42b50a8 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1614006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9cd28a3ecce9771cadb0e36267ef13e893fd366c
2021-03-09Merge "Adding RemoteProvisioner tests to visibility" am: 4a8421509dMax Bires
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1614006 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae7c55dd6810f3e342de5e9d4123b662fef117a4
2021-03-09Merge "Adding RemoteProvisioner tests to visibility"Max Bires
2021-03-04Merge "Add min_sdk_version for ART module." am: 8b678848c3 am: e05ea79af9 ↵Nicolas Geoffray
am: 78a9e6b6f1 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1615843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9abb064ad5914230227f4e6ff1901c48ba0f552
2021-03-04Merge "Add min_sdk_version for ART module." am: 8b678848c3 am: e05ea79af9Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1615843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f884f1ddb951268667f705693d106a53c00e72a
2021-03-04Merge "Add min_sdk_version for ART module." am: 8b678848c3Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1615843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4913a1e5bf3520e3b7a6a0cb12a758150d49fba5
2021-03-04Merge "Add min_sdk_version for ART module."Nicolas Geoffray
2021-03-03Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: I915e91d4259896c94494f203e3b9c87c82e00957
2021-03-02Adding RemoteProvisioner tests to visibilityMax Bires
This just allows the RemoteProvisioner app in packages/apps to use bouncycastle for testing purposes. Test: RemoteProvisioner tests build Change-Id: I539f22681cfd89124f6b3360ec0d7d06219e37ad
2021-02-26Merge "Bring back v1.61 PKCS12KeyStoreSpi behaviour." am: 84c892fb28 am: ↵Almaz Mingaleev
61caa2a40f am: 0a938fa0a4 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1609193 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a429769db604c402e2276742b5398259f876e3f
2021-02-26Merge "Bring back v1.61 PKCS12KeyStoreSpi behaviour." am: 84c892fb28 am: ↵Almaz Mingaleev
61caa2a40f Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1609193 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I31f6d0c39947f015f51ac656faeb80ae3dc4f5c6
2021-02-26Merge "Bring back v1.61 PKCS12KeyStoreSpi behaviour." am: 84c892fb28Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1609193 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idb1d3f5df9c1b89b4092dcde161ee730b7684176
2021-02-26Merge "Bring back v1.61 PKCS12KeyStoreSpi behaviour."Almaz Mingaleev
2021-02-26Bring back v1.61 PKCS12KeyStoreSpi behaviour.Almaz Mingaleev
BC 1.68 does not allow non-empty password for a keystore that does not require one. Upstream change: https://github.com/bcgit/bc-java/commit/a2e6598949ee83c8c23b98a372749ca378342706 Bug: 181188659 Bug: 179780002 Test: checked manually logcat for NPE entries on toggling WiFi ON/OFF Change-Id: Ia9ee55dd99453af359babf4f23d0c5b8e4843878
2021-02-26[automerger skipped] Expose unbundled BouncyCastle to Connectity cts am: ↵Daulet Zhanguzin
b6476282a7 -s ours am skip reason: Change-Id Ia8caf75b7b10a688b1927344d166108bc2aefa41 with SHA-1 1f5d532742 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bouncycastle/+/13692569 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5e5695c92801d8e9be5e38e1b98a8350e5e2ded0
2021-02-25Expose unbundled BouncyCastle to Connectity ctsDaulet Zhanguzin
The test runs across desserts and need to pass on R and S so it should use a single version of BouncyCastle Bug: 167645754 Bug: 180870458 Test: m CtsNetTestCasesLatestSdk Change-Id: Ia8caf75b7b10a688b1927344d166108bc2aefa41 Merged-In: Ia8caf75b7b10a688b1927344d166108bc2aefa41
2021-02-25Merge "Expose unbundled BouncyCastle to Connectity cts" am: a95a0e3447 am: ↵Remi NGUYEN VAN
37f0d68a30 am: 2086ec0b03 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1602520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a06e0d5809a6efee75820d088021a9eaf08b5de
2021-02-25Merge "Expose unbundled BouncyCastle to Connectity cts" am: a95a0e3447 am: ↵Remi NGUYEN VAN
37f0d68a30 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1602520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ebcbf961b54ed09fcbe7d8320f7d92547e2bc9d
2021-02-25Merge "Expose unbundled BouncyCastle to Connectity cts" am: a95a0e3447Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1602520 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1840de27ca4561e079b01ce39ac5b52f775f6602
2021-02-25Merge "Expose unbundled BouncyCastle to Connectity cts"Remi NGUYEN VAN
2021-02-24Merge "Update BC to 1.68." am: e566461849 am: 59dc7492b2 am: 0785a383adAlmaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1596471 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e630d09f945ad81293bd4494d5e3505b3632806
2021-02-24Merge "Update BC to 1.68." am: e566461849 am: 59dc7492b2Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1596471 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d56201221fee33b7672e97768c927b458999894
2021-02-24Merge "Update BC to 1.68." am: e566461849Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1596471 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ccd4fdd384e09a8765cae76dc89df5ad93820f7
2021-02-24Merge "Update BC to 1.68."Almaz Mingaleev
2021-02-24Expose unbundled BouncyCastle to Connectity ctsDaulet Zhanguzin
The test runs across desserts and need to pass on R and S so it should use a single version of BouncyCastle Bug: 180870458 Change-Id: Ia8caf75b7b10a688b1927344d166108bc2aefa41
2021-02-24Update BC to 1.68.Almaz Mingaleev
There is a commented catch-block in BaseBlockCipher. We believe it was added by mistake in https://github.com/bcgit/bc-java/commit/8a7c4bbefd743b5f716aecbbc5001838576a2d6c. For now we decided to skip it, but it needs follow-up with BC maintainers. Removed: bcprov/src/main/java/org/bouncycastle/pqc bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Zuc.java bcprov/src/main/java/org/bouncycastle/crypto/digests/Blake2xsDigest.java bcprov/src/main/java/org/bouncycastle/crypto/digests/Haraka256Digest.java bcprov/src/main/java/org/bouncycastle/crypto/digests/Haraka512Digest.java bcprov/src/main/java/org/bouncycastle/crypto/digests/HarakaBase.java crypto/modes/ChaCha20Poly1305.java EthereumIESEngine.java NHSecretKeyProcessor OscpCache ProvRevocationChecker PKIXCertPathValidatorSpi_8 JournaledAlgorithm jcajce/interfaces bcpkix/mime/test bcpkix/cms/test Bug: 179780002 Test: CtsLibcoreTestCases Test: CtsWhycheProofTestCases Test: CtsLibcoreOkHttpTestCases Test: MtsConscryptTestCases Change-Id: I69c493f9355b3775567148d9b7b1e7f4a71d03cf
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 283cf8374d -s ↵Xin Li
ours am: 2119c1d50e -s ours am skip reason: Change-Id I4aa52daff145172fcb93ddbb3f1fb78123632da6 with SHA-1 be93765489 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e14cc495d7549b4da984801a75976a4c07966e8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 283cf8374d -s oursXin Li
am skip reason: Change-Id I4aa52daff145172fcb93ddbb3f1fb78123632da6 with SHA-1 be93765489 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I64924978cf62eddabc8689217958f1e3a057fcbd
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I4aa52daff145172fcb93ddbb3f1fb78123632da6 Change-Id: Iba28f2ed60ab2060231235ec0466b7015f7f81b1
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bouncycastle" am: ↵Bob Badour
a96b65aaeb am: 9602a784e5 am: dc2d929551 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1588955 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic3696b1c075a7705dc0cc70ecbff28b5df1de584
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bouncycastle" am: ↵Bob Badour
a96b65aaeb am: 9602a784e5 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1588955 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9503a788acee017eb91827563ae92d5a50161945
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bouncycastle" am: a96b65aaebBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1588955 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88bed132cdabb19888c3753eb597b2c4f6e5ab70
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bouncycastle"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/bouncycastleBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I55cd7ab415a2a3f14a9d4488940784d0916b774a
2021-02-11Merge changes from topic "remove_bc_coreplatformapi" am: dc08e377b4 am: ↵Daulet Zhanguzin
919be1e1c7 am: fdef46a3f3 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1572460 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I479fd405b7b1c810da9b5462880f73d649ec730a
2021-02-11Remove CorePlatformApi annotation from BouncyCastle am: 7b7841790c am: ↵Daulet Zhanguzin
50ac609810 am: f324018b60 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1561875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie77acfa24b58d0aff42a5c788b07ff32c5515012
2021-02-11Merge changes from topic "remove_bc_coreplatformapi" am: dc08e377b4 am: ↵Daulet Zhanguzin
919be1e1c7 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1572460 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59de164f1a58ce370aab4e6d53a8b291b2d8e361
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 09:34:35 +0000