aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-07-28Merge cherrypicks of [4651530, 4651531, 4651532, 4651533, 4651534, 4651535, 4...android-9.0.0_r12android-9.0.0_r11pie-dr1-releaseandroid-build-team Robot
2018-07-28Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-07-25Merge cherrypicks of [4621410, 4621411, 4621412, 4621430, 4621450, 4621360, 4...android-build-team Robot
2018-07-25Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-07-20Snap for 4905103 from d64669a969f171e68649a7d5ad2b60468fc24297 to pi-dr1-releaseandroid-build-team Robot
2018-07-20Merge cherrypicks of [4593552, 4593553, 4593258, 4593575, 4593259, 4595367, 4...android-build-team Robot
2018-07-20Merge remote-tracking branch 'goog/upstream-master' into merge-citadel-mutexAndrew Scull
2018-07-20Merge remote-tracking branch 'goog/upstream-master' into merge-citadel-mutexpie-dr1-devAndrew Scull
2018-07-20Datagram: add mutex to protect data buffersAndrew Scull
2018-07-01Snap for 4872253 from 1e98103db981667e64493bd6d5a458dc31d9078c to pi-dr1-releaseandroid-build-team Robot
2018-06-28Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-06-29Merge "Fix verification token translation"Janis Danisevskis
2018-06-29Merge "[keymaster] Fix race condition at bootup"Janis Danisevskis
2018-06-28Fix verification token translationJanis Danisevskis
2018-06-28[keymaster] Fix race condition at bootupJanis Danisevskis
2018-06-28Merge "Snap for 4866883 from 273e3e168b8880b7e90136666b0e55c7795e764a to pi-d...android-build-team Robot
2018-06-28Snap for 4866863 from 273e3e168b8880b7e90136666b0e55c7795e764a to pi-dr1-releaseandroid-build-team Robot
2018-06-28Snap for 4866883 from 273e3e168b8880b7e90136666b0e55c7795e764a to pi-dr1-releaseandroid-build-team Robot
2018-06-27keymaster: remove lazy provisioningnagendra modadugu
2018-06-26Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-06-27keymaster: use TEST batch keys for nownagendra modadugu
2018-06-26[keymaster] Fixup attestation supportJanis Danisevskis
2018-06-26keymaster: fill in attest rpc'snagendra modadugu
2018-06-25keymaster: always pass update() calls throughnagendra modadugu
2018-06-24Snap for 4859140 from c942ed0d3cb64486aec69433f5e85c76b9152f7d to pi-dr1-releaseandroid-build-team Robot
2018-06-22Merge cherrypicks of [4401530, 4401531, 4402347, 4401509, 4401433, 4401434, 4...android-build-team Robot
2018-06-22Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-06-19Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-06-18keymaster: HardwareAuthenticator type is bitfieldnagendra modadugu
2018-06-15Add handling of TUP tag.Janis Danisevskis
2018-06-14Snap for 4839323 from 3eb9c40cc3c1316899c87d07e86b9d19989d810c to pi-dr1-releaseandroid-build-team Robot
2018-06-13Merge remote-tracking branch 'goog/upstream-master' into ngm-nos-merge-upstreamnagendra modadugu
2018-06-11keymaster: add missing tags to import-wrapped-key asn1nagendra modadugu
2018-06-10Snap for 4832091 from b123d9c6910631856f78c2965ad5878b3d1e027c to pi-dr1-releaseandroid-build-team Robot
2018-06-09keymaster: skip length check in ImportWrappedKeynagendra modadugu
2018-06-08Fix compiler error in android.Allen Webb
2018-06-08Implement confirmation token enforcementJanis Danisevskis
2018-06-08Merge "Weaver: log the throttling time."Andrew Scull
2018-06-08Weaver: log the throttling time.Andrew Scull
2018-06-08keymaster: cleanup debug logs in ExportKeynagendra modadugu
2018-06-07Merge remote-tracking branch 'goog/upstream-master' into citadel-ba9f1d086pie-devAndrew Scull
2018-06-07keymaster: remove unused buffer and blockMode fieldsnagendra modadugu
2018-06-07Merge "Keymaster HAL: fixed stoi exception."Allen Webb
2018-06-07AuthSecret: fix update reboot logicAndrew Scull
2018-06-06Keymaster HAL: fixed stoi exception.Allen Webb
2018-06-06keymaster: rpc scaffolding for attestationnagendra modadugu
2018-06-06Merge "NUGGET_PARAM_ENABLE_UPDATE tells us whether it worked or not"Andrew Scull
2018-06-06Merge "keymaster: add rsa and ec support to update()"Nagendra Modadugu
2018-06-05keymaster: add rsa and ec support to update()nagendra modadugu
2018-06-05Merge "Add NOTICE files to get copyright info published"Bill Richardson