aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-14Snap for 4502278 from 77039dd71222236a5cc653a3953b0758039234d8 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cts-releaseandroid-build-team Robot
Change-Id: I9d040a9fce5e06614de06266fe5b44305b679029
2017-12-14resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to ↵android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-releasenagendra modadugu
master am: f52a9aae46 am: 15ad1c7faa am: ad66180bfb Change-Id: I1df722cf80de8aa0ef3da56589107f75f1456774
2017-12-14Revert "Revert "report successful startup to the platform"" am: 9eb074bfa3 ↵nagendra modadugu
am: e46578ab17 am: 77c9cf4184 Change-Id: I8b1d80a9678134dfbb47490a34a2c25df24da00f
2017-12-14resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to ↵nagendra modadugu
master am: f52a9aae46 am: 15ad1c7faa Change-Id: I2624295ad90ce418f905f21b4cc2fa4ac149cbcc
2017-12-14Revert "Revert "report successful startup to the platform"" am: 9eb074bfa3nagendra modadugu
am: e46578ab17 Change-Id: Idd2bc4e530cf808da0f6041a938346ae02608044
2017-12-14resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to masternagendra modadugu
am: f52a9aae46 Change-Id: I19133361e7372b0b4e2228f6d7bec5256f9b331d
2017-12-14Revert "Revert "report successful startup to the platform""nagendra modadugu
am: 9eb074bfa3 Change-Id: I527a90bb19ab982b46137993d44b12886d8de00a
2017-12-13resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7nagendra modadugu
Test: I solemnly swear I tested this conflict resolution.
2017-12-13Revert "Revert "report successful startup to the platform""nagendra modadugu
This reverts commit 1d3b7dacf80d5003a816a38ad4481b5cf7cb8c80. (Reapply ae8d044cd15f49f56de4db84da7203a0ac2ff783, which broke the build, but has now been fixed upstream. This revert being done to unblock the automerger) BUG: 70533835 Test: none
2017-12-12Fix build breakage for non-CR50 builds.nagendra modadugu
Commit ae8d044cd1 introduced a externally defined callback _plat__ResetCallback() which is not available outside the CR50 environment. Address the issue with conditional compilation. TEST=docker fuzz container builds; CR50 builds Change-Id: If23c036c41a900bbcedd4b0bfd9edb1e89c17a0f Reviewed-on: https://chromium-review.googlesource.com/822601 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
2017-12-12Snap for 4498106 from addaa5e56d1040b8628636e9a744ef8e7daf773e to pi-releaseandroid-build-team Robot
Change-Id: I4c43e5716aa73f273ed029045ea8158ce71e04c8
2017-12-12Revert "report successful startup to the platform" am: 1d3b7dacf8 am: cfe80ed361Colin Cross
am: e7d921b9f0 Change-Id: Ia097b6fda833f55bfaee60505e9ea380f08cbfad
2017-12-12Revert "report successful startup to the platform" am: 1d3b7dacf8Colin Cross
am: cfe80ed361 Change-Id: I8bdd52ad26dff5ed9550abf13a5ac24052a34447
2017-12-12Revert "report successful startup to the platform"Colin Cross
am: 1d3b7dacf8 Change-Id: Idab0d8423830a54819b078d7422ea483297c7466
2017-12-11Revert "report successful startup to the platform"Colin Cross
Broke the build. This reverts commit ae8d044cd15f49f56de4db84da7203a0ac2ff783. Bug: 70533835 Test: none Change-Id: Ib9f874e70e71145dd78b0895502f47c4adf0afca
2017-12-12report successful startup to the platform am: ae8d044cd1 am: 40e9f967e4 am: ↵Vadim Bendebury
d93e63aaa8 am: 2b3aae417a Change-Id: I90c92a63d91775b8fd423780976b31fd355d11a7
2017-12-12report successful startup to the platform am: ae8d044cd1 am: 40e9f967e4Vadim Bendebury
am: d93e63aaa8 Change-Id: Ifc245b4b0c564cfba57499754d38835234b17b4c
2017-12-11report successful startup to the platform am: ae8d044cd1Vadim Bendebury
am: 40e9f967e4 Change-Id: Id4d74b2f67d4a6ad6902b5979ca9c18ab6fac7f6
2017-12-11report successful startup to the platformVadim Bendebury
am: ae8d044cd1 Change-Id: I7d8c51da6dc7def3cc0909e866f56b0e4683911d
2017-12-11report successful startup to the platformVadim Bendebury
For proper CCD password management it is necessary to be able to alert the rest of the system when the actual restart happens. A good indication of a restart is successful processing of the Starup command of the SU_RESET type. CQ-DEPEND=CL:804141 BRANCH=cr50 BUG=b:67007578 TEST=verified that the callback is indeed called on appropriate starups. Change-Id: I984fb971410ff29454250c40e44a7ca7710eaf1c Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/803741 Reviewed-by: Andrey Pronin <apronin@chromium.org>
2017-12-11Snap for 4496165 from 013acaed8f6ff657348bcf52d3b36e017320ada0 to pi-releaseandroid-build-team Robot
Change-Id: Ic8449a12778cff3e603a326ceb36bc508a4cd873
2017-12-09NV: allow reading FWMP before startup am: c456225bd5 am: f91bf20527 am: ↵Vadim Bendebury
39e898f8b5 am: 3f1d0efcbc Change-Id: I2a64b0e0c3ea3438cdeea153b8c232aedc72b94f
2017-12-09NV: allow reading FWMP before startup am: c456225bd5 am: f91bf20527Vadim Bendebury
am: 39e898f8b5 Change-Id: I88c40dad59efef58f8daf51e875bda9d2f3f6833
2017-12-09NV: allow reading FWMP before startup am: c456225bd5Vadim Bendebury
am: f91bf20527 Change-Id: Ia16f65b55f05626b72e0aa985a0ea873cbc1ea4a
2017-12-09NV: allow reading FWMP before startupVadim Bendebury
am: c456225bd5 Change-Id: I6ffef8f2e89b57ff437943abe0e4c633188adc88
2017-12-08NV: allow reading FWMP before startupVadim Bendebury
This kludge makes sure that FWMP contents can be read even before TPM2_Startup command is issued, which makes sure that even on bricked protected Crhome OS devices CCD opening can be prevented. BRANCH=Cr50 BUG=b:62537474 TEST=verified that FWMP could be read even before AP is powered up Change-Id: I9693f7ff64ae86d8ed0d57c4079822ee56c464ee Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/817935 Reviewed-by: Andrey Pronin <apronin@chromium.org>
2017-10-29Snap for 4422293 from 56e9028c1e019db64416acfcb9b55b6357637aea to pi-releaseandroid-build-team Robot
Change-Id: I884b4b529b836d3ab9d50be5e9cdf07823af386c
2017-10-27[oss-fuzz] fix clang compiler error am: 0f114d2d7e am: 4fe74becad am: 1e1db6bea1nagendra modadugu
am: 06141a7664 Change-Id: I126346b480735a6924202dec67c53eb6474c7322
2017-10-27[oss-fuzz] fix clang compiler error am: 0f114d2d7e am: 4fe74becadnagendra modadugu
am: 1e1db6bea1 Change-Id: I51e7380eb97739f5a397d1efb73c6873dabeb496
2017-10-27[oss-fuzz] fix clang compiler error am: 0f114d2d7enagendra modadugu
am: 4fe74becad Change-Id: I462668f5b5f05324d32232cb4c55a2848c7e3a83
2017-10-27[oss-fuzz] fix clang compiler errorandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6nagendra modadugu
am: 0f114d2d7e Change-Id: I15264830274239e9e5d6fe586c43beedcbc287f5
2017-10-26[oss-fuzz] fix clang compiler errornagendra modadugu
Fix size_t compare with < 0 in CpriMisc.c Issue reported here: https://github.com/google/oss-fuzz/issues/859 Change-Id: I908c674f11d16bf9a795fe0c9e5c0fd0b467b1dc Reviewed-on: https://chromium-review.googlesource.com/739946 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Andrey Pronin <apronin@chromium.org>
2017-05-13[oss-fuzz] update Dockerfile to point to updated Docker image am: cb2de5a810 ↵oreo-mr1-devoreo-dr1-devnagendra modadugu
am: 00f7bc755f am: 64835ccfa3 am: 0a3aabedb9 am: 0cd05a1802 Change-Id: Iaf1d529fb0ea530a21b721a5d833a93420c130eb
2017-05-13[oss-fuzz] update Dockerfile to point to updated Docker image am: cb2de5a810 ↵android-o-mr1-preview-2android-o-mr1-preview-1nagendra modadugu
am: 00f7bc755f am: 64835ccfa3 am: 0a3aabedb9 Change-Id: Ic7a20de77211aaf50087c6a94463650e31e2373d
2017-05-13[oss-fuzz] update Dockerfile to point to updated Docker image am: cb2de5a810 ↵nagendra modadugu
am: 00f7bc755f am: 64835ccfa3 Change-Id: Iabbaf608bc8b5999ca7d5b98abb7c10261891522
2017-05-13[oss-fuzz] update Dockerfile to point to updated Docker image am: cb2de5a810nagendra modadugu
am: 00f7bc755f Change-Id: Ibb5bab7f0a92b279f9e2e9ecbe9372b90ee1ea22
2017-05-13[oss-fuzz] update Dockerfile to point to updated Docker imageandroid-o-preview-4android-o-preview-3android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4nagendra modadugu
am: cb2de5a810 Change-Id: Ibe0d2b123dc6c5f3d313ef5af8e048fba8bbb0bc
2017-05-12[oss-fuzz] update Dockerfile to point to updated Docker imagenagendra modadugu
Sync Dockerfile with upstream, pulling image from gcr.io. Also update README to include instructions on launching alternative fuzzer modes. BUG=none BRANCH=none TEST=follow instructions in fuzz/build.sh Change-Id: I1f2066810a2f1fd9f43cd9b98859759f51dfb935 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/502068 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org>
2017-05-12Rewrite MemoryEqual() to be constant-time. am: e760ff57b9 am: a71795a2cd am: ↵nagendra modadugu
07a9435803 am: 19237091e3 am: 98b0e9b9f4 Change-Id: If08baa76ab20307f1690ffad345152e7f6616faf
2017-05-12Rewrite MemoryEqual() to be constant-time. am: e760ff57b9 am: a71795a2cd am: ↵nagendra modadugu
07a9435803 am: 19237091e3 Change-Id: Ie987d7bf3c9872ec35cbe88f863ebaf58b3e4950
2017-05-12Rewrite MemoryEqual() to be constant-time. am: e760ff57b9 am: a71795a2cdnagendra modadugu
am: 07a9435803 Change-Id: I7c9ac4a9973aa33890034a544a5aec0cf3f5c8a2
2017-05-12Rewrite MemoryEqual() to be constant-time. am: e760ff57b9nagendra modadugu
am: a71795a2cd Change-Id: I4b54efeedb0e6835491ac40d29a47af9bcc24a7d
2017-05-12Rewrite MemoryEqual() to be constant-time.nagendra modadugu
am: e760ff57b9 Change-Id: I21c094b84f345de24afde68875d0558148042374
2017-05-11Rewrite MemoryEqual() to be constant-time.nagendra modadugu
The current implementation of MemoryEqual will not necessarily compile to a constant-time instruction sequence. This change ensures that every byte of the input must be inspected. BRANCH=none BUG=none TEST=TCG tests pass Change-Id: Ide83bce6cafea2d48c03e5116e97a6dd23419134 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/503478 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Andrey Pronin <apronin@chromium.org>
2017-05-05Android.mk -> Android.bp am: 4454439844 am: c8ea94480d am: 9695b44f9aSteven Moreland
am: 2022877777 Change-Id: I357e3b3bffebb02eac1b73813e5a5327203c1ea2
2017-05-05Android.mk -> Android.bp am: 4454439844 am: c8ea94480dSteven Moreland
am: 9695b44f9a Change-Id: If4762aa705543514d891a0604e7c961cc02998cf
2017-05-05Android.mk -> Android.bp am: 4454439844Steven Moreland
am: c8ea94480d Change-Id: I4e0b9703317df67dc6b999c7645091394d7cbaa5
2017-05-05Android.mk -> Android.bpSteven Moreland
am: 4454439844 Change-Id: I1c98b0a5e4d19e805a5da8df677a3c5e6bc5bc4a
2017-05-04Android.mk -> Android.bpSteven Moreland
Test: links Bug: 37512442 Change-Id: I6a5bd123737d3bffa6b6c27c8d598552d2d3fb0f
2017-01-28Change NVMEM size to match cr50 implementation am: 1a68fe6fa8 am: d5f5f466f6 ↵android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseVadim Bendebury
am: 4f0ca3b562 am: 3ec2270abd am: 29e56ce56b Change-Id: I09813b6c15dac1445e9f10c64465b8dfb70f4534
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 03:24:15 +0000