aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: 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 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 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 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 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 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 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 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
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3 am: 24807d9b5fPaul Duffin
Change-Id: I7b170771c5a2483314d441abfd2c769fdc189424
2020-04-09Depend on conscrypt.module.platform.api not stubs am: 3fde40e7e3Paul Duffin
Change-Id: Ibe48d1d79e2c3cb58bd88bf8488c6d92dde38c9c
2020-04-08Depend on conscrypt.module.platform.api not stubsPaul Duffin
Changed the dependency from the stubs module created by the conscrypt.module.platform.api java_sdk_library to the conscrypt.module.platform.api java_sdk_library itself. Needed to allow the conscrypt.module.platform.api to be exported from conscrypt-module-sdk instead of the stubs module. Bug: 153443117 Test: m wycheproof Manually verified that the classpath was the same before and after the change. Verified that while Soong rebuilt the ninja file after this change it did not need to rebuild the wycheproof which indicates that ninja determined that the command line to build it had not changed. Change-Id: I75a46825e7dcf937083eb7954aafe6a2446b0c81
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83 ↵Bob Badour
am: 6b6f1fd1de am: 546dd9c83b Change-Id: Iaacc11c767acf12f3185fff3727c5aeb83499273
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83 ↵Bob Badour
am: 6b6f1fd1de Change-Id: I6ce8ad997c89269ffc972e075fdddf6438d2d47f
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83Bob Badour
Change-Id: Ia3258b24c08b0889c29a7b52ae2593b2b737e284
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 217dd213c0 am: 514e512b83Bob Badour
Change-Id: Ibffee356e720fa29581513dc394b9d2783bdd640
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 217dd213c0Bob Badour
Change-Id: If0b9be14cb7ba16d28e773cee33649566845879f
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ie6879117c5a42f08d000875c80fc56056f1b79f1
2020-01-03wycheproof: Delegate to conscrypt OWNERS. am: d9fb540d13 am: 079ebd5392 am: ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-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_r31android-11.0.0_r30android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
d3ed1708ab Change-Id: I10b10a800d47d62aee06a85e6aea72b31356e25e
2020-01-03wycheproof: Delegate to conscrypt OWNERS. am: d9fb540d13 am: 079ebd5392android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I65a6581707a62548240d0308fe4a759a0be53bb1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 23:24:10 +0000