aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/tpm2-tss am: d76eac9f45 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-1Bob Badour
9121942948 am: cdc8abb1a6 Original change: https://android-review.googlesource.com/c/platform/external/tpm2-tss/+/1588896 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib59af7b5443b990d9140201ff2dbcd540d4af28b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/tpm2-tss am: d76eac9f45 am: 9121942948Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/tpm2-tss/+/1588896 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib703f7d20bc37d4f1a6db5a672a1297116b27ec1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/tpm2-tss am: d76eac9f45android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/tpm2-tss/+/1588896 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b4e4ee53b761785dc94fda62312ccb826885b12
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/tpm2-tssandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ieafe8309b3bedf0830130e2178718f70cde6c1b6
2020-05-14Support host compilation for tpm2-tss. am: 874eefdfd4 am: 13b6223a58 am: ↵A. Cody Schuffelen
ef70c209e1 am: fcc4868a1b am: af75585f60 Change-Id: I0cdba9c9986852d40df2b52b4ae92a2a31c03a00
2020-05-14Support host compilation for tpm2-tss. am: 874eefdfd4 am: 13b6223a58 am: ↵android11-gsiA. Cody Schuffelen
ef70c209e1 am: fcc4868a1b Change-Id: I9639db318546621d0c43f9ba40482b8a6d6ed23e
2020-05-14Support host compilation for tpm2-tss. am: 874eefdfd4 am: 13b6223a58 am: ↵A. Cody Schuffelen
ef70c209e1 Change-Id: I7e393f46d11d4bfbd3a153e1a5accc04bbef41e7
2020-05-14Support host compilation for tpm2-tss. am: 874eefdfd4 am: 13b6223a58A. Cody Schuffelen
Change-Id: I26daf5596aad822972c5198ad232ebd465efb13b
2020-05-14Support host compilation for tpm2-tss. am: 874eefdfd4android-r-beta-3android-r-beta-2A. Cody Schuffelen
Change-Id: I984bcc9cbbca22a994d123d7fc26030c7edb271d
2020-05-13Support host compilation for tpm2-tss.A. Cody Schuffelen
This will let us use tpm2-tss from the secure_env process on the cuttlefish host. Test: Compiles Bug: 155695501 Change-Id: I07df2a23c36e7c717a2b1acb8be3b11d3243dd9f
2020-04-24Add license type: Apache2+BSD are NOTICE licenses am: 3cf227d610 am: ↵Bob Badour
9f085a3390 am: a5aa83940c am: bf077efdd6 am: 41e579da97 Change-Id: I8da589e14e8a6742311ddcac0db012d68e8a7448
2020-04-24Add license type: Apache2+BSD are NOTICE licenses am: 3cf227d610 am: ↵Bob Badour
9f085a3390 am: a5aa83940c am: bf077efdd6 Change-Id: Idbf89f71294548fc9adae8c9a59d582f6bed3abe
2020-04-24Add license type: Apache2+BSD are NOTICE licenses am: 3cf227d610 am: ↵Bob Badour
9f085a3390 am: a5aa83940c Change-Id: I2b4d27bfa17c48af4e5aee10e4401fb6ce568c9f
2020-04-24Add license type: Apache2+BSD are NOTICE licenses am: 3cf227d610 am: 9f085a3390Bob Badour
Change-Id: I0acdedbdc03a8bf2bb54493c4bc83be166f9e74b
2020-04-24Add license type: Apache2+BSD are NOTICE licenses am: 3cf227d610Bob Badour
Change-Id: I0ffc6c92cec0971c0eeaa3c46d6e32c23d3d2246
2020-04-23Add license type: Apache2+BSD are NOTICE licensesBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Idc6788e90437603e1dc34de0ea48ecb4802ffb1c
2020-04-11Upgrade tpm2-tss to '2.4.0' am: 64890da02c am: 0842be9b62 am: 87d68cbad3 am: ↵Haibo Huang
3480151e69 am: 9133591a7f Change-Id: I1fb137815bba5b1703754d61cbc0b08be6f6ebf1
2020-04-11Upgrade tpm2-tss to '2.4.0' am: 64890da02c am: 0842be9b62 am: 87d68cbad3 am: ↵Haibo Huang
3480151e69 Change-Id: I8fd3e8ba7d5a27afe8438a9cf1de2723690fd303
2020-04-11Upgrade tpm2-tss to '2.4.0' am: 64890da02c am: 0842be9b62 am: 87d68cbad3Haibo Huang
Change-Id: I0d9f571d175fd7ffa9809a963ed96f742117a38a
2020-04-11Upgrade tpm2-tss to '2.4.0' am: 64890da02c am: 0842be9b62Haibo Huang
Change-Id: I22c888c09b0f8de41901619f280610e413fa86cd
2020-04-11Upgrade tpm2-tss to '2.4.0' am: 64890da02cHaibo Huang
Change-Id: I288262946f97096d315e888f02737ed70f2c5b79
2020-04-11Upgrade tpm2-tss to '2.4.0'Haibo Huang
Exempt-From-Owner-Approval: upgrade Change-Id: Id2c6f9781ab901c2640a27fb84a78bb0ce2b7c9f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 295c12817c -s ours am: 86d12905ea am: c4557603e6 am: 2ac93573c9 -s ours am skip reason: subject contains skip directive Change-Id: Ie037a169566255e6ab83a6864d46e550a3f31309
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 295c12817c -s ours am: 86d12905ea am: c4557603e6 Change-Id: I0e0b81a15e45acfd94aef3ebedda46f202a7765c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 295c12817c -s ours am: 86d12905ea Change-Id: I87ff3dc9522303564c98162c75098daa238fd1cf
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 295c12817c -s ours am skip reason: subject contains skip directive Change-Id: I932770098e2a70d3dc130e32ad2a99f6fbe6214b
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I99edd4742f0f5dbcff971d4b46297daefb739895
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2e am: a65b8546bd am: ↵Bob Badour
53b9895a7c am: 9ae21dd65a am: 7bf00cac4e Change-Id: Ia5485eb903df868360915776b63a5cb5c7138d9d
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2e am: a65b8546bd am: ↵Bob Badour
53b9895a7c am: 9ae21dd65a Change-Id: I01729ea4e9860441f3113a967cfea9c6b7949c92
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2e am: a65b8546bd am: ↵Bob Badour
53b9895a7c Change-Id: I33d9b63b1af6655333120a0c2bc2f989df54e352
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2e am: a65b8546bdBob Badour
Change-Id: I75739359f1cced26635449523b74179936d17475
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2e am: a65b8546bdBob Badour
Change-Id: I822fec54d181fc5353d803560fc74e46cfb31e02
2020-03-26Remove redundant NOTICE symbolic link. am: cec6076d2eBob Badour
Change-Id: I6b4d947d5f5497443370a88900d6d4b63b3958c8
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I2f628a940f2c2cf895c6359a8275376572271af5
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 731df51371 -s ours am: 282a387855 am: 28b5caffcf am: bf833aa2d3 -s ours am skip reason: subject contains skip directive Change-Id: I479430b043c93211b6326d5fa03118b60f9b9a4c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 731df51371 -s ours am: 282a387855 am: 28b5caffcf Change-Id: I1918210beb720afb0a473216e39744b3c9f5490c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 731df51371 -s ours am: 282a387855 Change-Id: I382fb7a7410e840f3282ec630cbd794c4e545856
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 731df51371 -s ours am skip reason: subject contains skip directive Change-Id: I6667967531fe388a73f7017fba8c9d77ccf2d863
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 731df51371 Change-Id: I3f738c68a3b83da00dfbe249a8445ac27baa9551
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ie47243ec469c6fd3b4269c7d6cb61fe022c0fa82
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01 am: ↵A. Cody Schuffelen
7fb129ff2f am: 660a626488 am: eb426985a4 am: 5201f1c0b4 Change-Id: I795c4376005f8d8a568a9cf2569fe05a92a44287
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01 am: ↵A. Cody Schuffelen
7fb129ff2f am: 660a626488 am: eb426985a4 Change-Id: Iee74abeff01aa12645956c5555b1dd552ab8de28
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01 am: ↵A. Cody Schuffelen
7fb129ff2f am: 660a626488 Change-Id: I0ea716e4823a0888e69f8a51f2e50551b0879f34
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01 am: ↵A. Cody Schuffelen
7fb129ff2f Change-Id: Ib84423881aedc1911c5a7651cbfe55a71e458a53
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01 am: ↵A. Cody Schuffelen
7fb129ff2f Change-Id: I7050dcac4eface04ca961a96599e88c93ab1667c
2020-03-17ANDROID: hook tpm2-tss into the android logging system am: 1365217e01A. Cody Schuffelen
Change-Id: Ib16725fd1fb6acecae2790443a8029f4bc9cf4e2
2020-03-16ANDROID: hook tpm2-tss into the android logging systemandroid-r-preview-4android-r-preview-3android-r-preview-2A. Cody Schuffelen
Bug: 148102516 Test: Build other code using this Change-Id: I224ceb5c23be25b51766eef2b5a01d8d92657caa
2020-03-11configure.ac: version bump to 2.4.0Tadeusz Struk
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
2020-03-11CHANGELOG.md: version bump to 2.4.0Tadeusz Struk
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
2020-03-11test/esys: Check unsupported symmetric cipher used for Esys_EncryptDecrypt ↵Juergen Repp
test. The key type TPM2_ALG_SYMCIPHER might not be supported. In this case the test will be skipped. Signed-off-by: Juergen Repp <juergen.repp@sit.fraunhofer.de>