aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-11Merge "Run wycheproof tests against unbundled version of BouncyCastle" am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Daulet Zhanguzin
6d3f046ff9 am: fbcaf9f3c8 am: 479ec25490 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1572480 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d756d6750f07ce2c8e4732bb6c9c7e4b645b06a
2021-02-11Merge "Run wycheproof tests against unbundled version of BouncyCastle" am: ↵Daulet Zhanguzin
6d3f046ff9 am: fbcaf9f3c8 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1572480 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8a127d9ffaaba5bb486b313ec5e45c9825be718
2021-02-11Merge "Run wycheproof tests against unbundled version of BouncyCastle" am: ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Daulet Zhanguzin
6d3f046ff9 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1572480 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie5322502910d61e01aa648025a9bd7cfea03afd8
2021-02-11Merge "Run wycheproof tests against unbundled version of BouncyCastle"android-s-preview-1Daulet Zhanguzin
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/wycheproof am: d43f2886cc am: ↵Bob Badour
760adb131f am: bdc7f8b16b Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1576036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iddbeb90127d52213dca4988d4d97c23a872f470c
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/wycheproof am: d43f2886cc am: ↵Bob Badour
760adb131f Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1576036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5aad27346abd4d499f2b76814e00b5a39660aece
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/wycheproof am: d43f2886ccBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1576036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I383535ec75811d2eee2329e8f6afa49044cfdd64
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/wycheproofBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7863a2b22a8fd7c7a5fc311f0f365c253869de97
2021-02-03Run wycheproof tests against unbundled version of BouncyCastleDaulet Zhanguzin
Test: Treehugger Change-Id: I4439fb6b1052d15589bad359d1e5cb447cdc8223
2020-06-09Split the core/platform API into stable and legacy versions. am: 8a6152b03a ↵Pete Gillin
am: 32f54cd7e2 am: 3e86fc2cb9 am: d81aa9d710 am: 7f8ed30017 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928 Change-Id: I77e8610cc97d32f1d65d7df931b68d113e57fdd5
2020-06-09Split the core/platform API into stable and legacy versions. am: 8a6152b03a ↵Pete Gillin
am: 32f54cd7e2 am: 3e86fc2cb9 am: d81aa9d710 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928 Change-Id: I041574a3b8c518eb83599e7d8c0e9d4ec11eeb3f
2020-06-09Split the core/platform API into stable and legacy versions. am: 8a6152b03a ↵Pete Gillin
am: 32f54cd7e2 am: 3e86fc2cb9 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928 Change-Id: I3973b00ff86cc701a2df3c26dee6f9723762f7b0
2020-06-09Split the core/platform API into stable and legacy versions. am: 8a6152b03a ↵Pete Gillin
am: 32f54cd7e2 Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928 Change-Id: I877b337295d676d0fc5e2bcf99cefeb2d9a2a79b
2020-06-09Split the core/platform API into stable and legacy versions. am: 8a6152b03aPete Gillin
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/1321928 Change-Id: I82e50a634396bdbee1f5ce80dcf9a11f5e84a978
2020-06-03Split the core/platform API into stable and legacy versions.android-r-beta-3android-r-beta-2Pete Gillin
For now, everything outside libcore still uses the legacy version. Test: treehugger Bug: 157640067 Change-Id: I257331c27fde7499542ee23d00b0e1c3bbe29dbd
2020-05-13Remove deprecated BouncyCastle algorithms am: 013daa2841 am: 2c75c3e2c1 am: ↵Daulet Zhanguzin
858d8e28ae am: be7ca6c867 am: cc2d6a6687 Change-Id: I2b6b465c064c72bf4ce318f559965b399cd0a20f
2020-05-13Remove deprecated BouncyCastle algorithms am: 013daa2841 am: 2c75c3e2c1 am: ↵Daulet Zhanguzin
858d8e28ae am: be7ca6c867 Change-Id: I568858214844d790624037c57c171ea919e00497
2020-05-13Remove deprecated BouncyCastle algorithms am: 013daa2841 am: 2c75c3e2c1 am: ↵Daulet Zhanguzin
858d8e28ae Change-Id: I2ef7d577980e0942b5425ff35bd8dc1e8a83e02a
2020-05-13Remove deprecated BouncyCastle algorithms am: 013daa2841 am: 2c75c3e2c1Daulet Zhanguzin
Change-Id: I2b8ba8b033415da763570851b5925d630f2312ae
2020-05-13Remove deprecated BouncyCastle algorithms am: 013daa2841Daulet Zhanguzin
Change-Id: I7ec1af3e5269b9c50063e7bb6c274312eadd0e26
2020-05-06Remove deprecated BouncyCastle algorithmsDaulet Zhanguzin
Stop testing BouncyCastle for removed algorithms. Bug: 67761667 Test: cts -m CtsLibcoreWycheproofBCTestCases Test: cts -m CtsLibcoreWycheproofConscryptTestCases Change-Id: I3b81937f8f80011aa9c7edbb18072079292f96a3
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 ↵Jack He
am: 3fc418dda8 am: d0087c5dab am: 4f802d80c8 am: 364cf5b683 Change-Id: Ib6cbf3cf93019b89ef4828b18587e7fe6a55c55d
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 ↵Jack He
am: 3fc418dda8 am: d0087c5dab am: 4f802d80c8 Change-Id: Id117d5782b0b261852e037b27ac19cbf063c570b
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 ↵Jack He
am: 3fc418dda8 am: d0087c5dab Change-Id: Ic98e4e695afe361fb1b57e380dc97f9780e41274
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46 ↵Jack He
am: 3fc418dda8 Change-Id: I8a40c6483a7aea134cc23430665acf25374684cc
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms"" am: 4e6be05f46Jack He
Change-Id: I243202e63487adc23c57bb4f7e5cd690f28adb16
2020-05-05Merge "Revert "Remove deprecated BouncyCastle algorithms""Jack He
2020-05-05Revert "Remove deprecated BouncyCastle algorithms"Jack He
Revert "Remove deprecated BouncyCastle algorithms" Revert submission 1299358-remove_bc_algos Reason for revert: broke higkey-userdebug Bug: 155693016 Reverted Changes: I98adb4d2f:Load default KeyFactory instead of BC's implementa... I5256fe1c7:Remove deprecated BouncyCastle algorithms I0437de742:Remove deprecated BouncyCastle algorithms Ie9e0cfa02:Remove deprecated BouncyCastle algorithms Change-Id: I6030fdd2339b62ba51e7322caa3224f18023373e
2020-05-04Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9 am: ↵Daulet Zhanguzin
6da408c351 am: db44f91b5b am: ad1c077d2f am: f513316edd Change-Id: I2dc5a84f77e271c8f5c51e1b1523c8e34c5704ce
2020-05-04Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9 am: ↵Daulet Zhanguzin
6da408c351 am: db44f91b5b am: ad1c077d2f Change-Id: I75a13260c666f0133ad1d5586232c670eac4d644
2020-05-04Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9 am: ↵Daulet Zhanguzin
6da408c351 am: db44f91b5b Change-Id: If1a232d72ca8ea900f748b59753ce87d80adad2e
2020-05-04Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9 am: 6da408c351Daulet Zhanguzin
Change-Id: Ia0c49e3aff38a625a3a0a66a2ca367231d5ec470
2020-05-04Merge "Remove deprecated BouncyCastle algorithms" am: 6a6bd3c6e9Daulet Zhanguzin
Change-Id: Idb308532d04dbc4e8c9c0842d1d862ed6a85923e
2020-05-04Merge "Remove deprecated BouncyCastle algorithms"Daulet Zhanguzin
2020-05-02Remove deprecated BouncyCastle algorithmsDaulet Zhanguzin
Stop testing BouncyCastle for removed algorithms. Bug: 67761667 Test: cts -m CtsLibcoreWycheproofBCTestCases Test: cts -m CtsLibcoreWycheproofConscryptTestCases Change-Id: I5256fe1c7fefa2bd44ab29603e1bf9e3df51631b
2020-04-29Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530 am: 059caa19f7 am: ↵Bob Badour
23445940a6 am: 652454068b am: 87e4589ef0 Change-Id: I9ef9fc8c234773931a4ba5b20dc12fbfb37553b2
2020-04-29Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530 am: 059caa19f7 am: ↵Bob Badour
23445940a6 am: 652454068b Change-Id: I5656996652fa30d18934311f19182c4fcf4ef861
2020-04-29Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530 am: 059caa19f7 am: ↵Bob Badour
23445940a6 Change-Id: I9a3bd5b36fa11910138aaf4c3930d1867d400421
2020-04-29Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530 am: 059caa19f7Bob Badour
Change-Id: Ib12507a52b4ed35a676bf621b8745b5a5614d64d
2020-04-29Add METADATA to wycheproof: Apache2=NOTICE am: 446edf1530Bob Badour
Change-Id: Ib7c11fc5ffa6392398851cb123181cb545c79300
2020-04-28Add METADATA to wycheproof: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I75100533cf6a3efdbbdabd1a2113c27fdb08fecb
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c35393618e -s ours am: d5222063df am: 5f78560920 am: 1ffe212335 -s ours am skip reason: subject contains skip directive Change-Id: Ia22aab4e1c2ccf7c41d22ff953f780c2f7451e84
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c35393618e -s ours am: d5222063df am: 5f78560920 Change-Id: Ifb9e9cef057d496f009802272a292b61e6ab426d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c35393618e -s ours am: d5222063df Change-Id: I5c3c9d9d3420dd679f5468791cdce5ee5cb998e2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c35393618e -s ours am skip reason: subject contains skip directive Change-Id: I77046c2de2fe65f04ad0f3940e0e6b4fc760bd79
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I6d0fd5ce56237943996beb9bb8be0220d377d2f2
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: ↵Paul Duffin
24807d9b5f am: ca0051ec49 am: c2f5ec2ec6 am: 85a3cd19ff Change-Id: I8431901cde230fba8a501ac5121f93d5c286be03
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: ↵Paul Duffin
24807d9b5f am: ca0051ec49 am: c2f5ec2ec6 Change-Id: I63c0b0be3e2ef361fc8418531b168f9ba5b0f875
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: ↵Paul Duffin
24807d9b5f am: ca0051ec49 Change-Id: I3218ce2b47b52fde6b737558ecd5a7a83d8c9ca6
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: 24807d9b5fPaul Duffin
Change-Id: I9256ef5396a64808d928b25bcd6734ffbfc44e26
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 18:29:21 +0000