summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-30Rename IKeymaster back to IKeymasterDeviceShawn Willden
Test: VtsHalKeymasterV4_0TargetTest Change-Id: I98f257839ce5d8b8e16224702789b410977d8362
2017-11-28Add commit hook to run clang-format.Shawn Willden
Test: N/A Change-Id: I95b3d1924e007ab80dae1ce46311dda14bd4bcc9
2017-11-27Add KM4 SW implementation.Shawn Willden
Bug: 63931634 Test: VtsHalKeymasterV4_0TargetTest Change-Id: I4144916822b07b50e70056413769b9c89ccbb5c2
2017-11-22Merge "Change libkeymaster3device to vendor:true"Logan Chien
2017-11-21Change libkeymaster3device to vendor:trueLogan Chien
This commit replaces `vendor_available:true` with `vendor:true` because currently only android.hardware.keymaster@3.0-impl.so depends on libkeymaster3device.so and system shared libraries are unlikely to depend on libkeymaster3device.so directly. Test: Sailfish builds and boots (p.s. there should be no difference because /vendor/lib[64]/libkeymaster3device is identical). Change-Id: Ibe0fdd6c5f9f905bfc3110ed87535223e0d3deb1
2017-11-20Add missing check for attestation challenge lengthJanis Danisevskis
During the refactoring of the keymaster codebase this check was dropped. This patch adds the check again. Bug: 67863286 Test: Keystore CTS test Change-Id: I1157643304e1f5f0a5b14cb5ed6275760217ab4c
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: 3403c37ac3 Change-Id: I07cd2b26c6c0a402b13f10a51e28844bd5d716e0
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I0ba6f4788f17cbcc31a5ab64cda44dcc9b370cd3
2017-11-13Merge commit 'f4feb415599ae6db9b87e684d0af16e91b0eaf39' into HEADXin Li
Change-Id: I44062891020f3bb7473b01e33aeb02d087d5db9c
2017-11-07Remove keymaster_tests build.Shawn Willden
This will be refactored and revived in a future CL. For now, just getting it out of the way. Test: NA Change-Id: I4edd7772d827d6b8589208a06512f5cbdf85171d
2017-11-01Merge "DO NOT MERGE: Set TEE RootOfTrust fields in Attestation Extension" ↵Jocelyn Bohr
into stage-aosp-master am: 12ec6e3aee am: 2f84aa0042 -s ours Change-Id: Ic6145c718d010a978608fb6f523a5e04ab5c25a2
2017-11-01Merge "DO NOT MERGE: Set TEE RootOfTrust fields in Attestation Extension" ↵Jocelyn Bohr
into stage-aosp-master am: 12ec6e3aee Change-Id: I6323d4ae06b22d36d2265646fadc54ffcdcfa60f
2017-11-01Merge "DO NOT MERGE: Set TEE RootOfTrust fields in Attestation Extension" ↵TreeHugger Robot
into stage-aosp-master
2017-10-31Set TEE RootOfTrust fields in Attestation Extension am: e27d7b6322 -s ours ↵Jocelyn Bohr
am: 5dfbfc488a -s ours am: e34c85ab50 -s ours Change-Id: I61953c0bc42ff326f5c1aa788b6479eef08d2dbe
2017-10-31Set TEE RootOfTrust fields in Attestation Extension am: e27d7b6322 -s oursJocelyn Bohr
am: 5dfbfc488a -s ours Change-Id: Ic05ea28b382e1705cb299389963641286495d52b
2017-10-31Set TEE RootOfTrust fields in Attestation ExtensionJocelyn Bohr
am: e27d7b6322 -s ours Change-Id: Ib1bc2c01761d70b7ebae7df475da5b35e96169cd
2017-10-31DO NOT MERGE: Set TEE RootOfTrust fields in Attestation ExtensionJocelyn Bohr
Sets RootOfTrust fields in the TEE enforced AuthorizationList of the Attestation Extension. Previously, there was no generic way to get get verified boot state from a TEE-based Keymaster implementation. Test: Passes keystore attestation CTS tests on a device with a KM2 TEE implementation. Software KM still passes attestation CTS tests. Bug: 64949951 Change-Id: I24fc0485d5c6aed7cf5b3665cbef12e627123c70 (cherry-picked from commit a4cd5b96750ade8a606d34623982432a96b8fe2a)
2017-10-31Set TEE RootOfTrust fields in Attestation Extensionandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Jocelyn Bohr
Sets RootOfTrust fields in the TEE enforced AuthorizationList of the Attestation Extension. Previously, there was no generic way to get get verified boot state from a TEE-based Keymaster implementation. This was merged earlier but the change disappeared when internal was pushed to AOSP. Test: 1. Passes keystore attestation CTS tests on a device with a KM2 TEE implementation. Software KM still passes attestation CTS tests. 2. Trusty builds Bug: 64949951 Change-Id: Id1dd91a4ffcef5ba1544e45de28625aa07e65e59 Merged-In: I24fc0485d5c6aed7cf5b3665cbef12e627123c70
2017-10-17Handle RSA_R_DATA_TOO_LARGE am: a32e1c8e5a am: 94742cf14e am: f6d5139364 -s ↵Shawn Willden
ours am: f4feb41559 -s ours Change-Id: I8ce1e266d480878c72673bac0e3ed086d6aa1a5d
2017-10-17Handle RSA_R_DATA_TOO_LARGE am: a32e1c8e5a am: 94742cf14eShawn Willden
am: f6d5139364 -s ours Change-Id: Id6560dc746ab5e9bd260446e0a9c54d978f14fc3
2017-10-17Handle RSA_R_DATA_TOO_LARGE am: a32e1c8e5aShawn Willden
am: 94742cf14e Change-Id: I7c4718cddd1a9e2a8a0d20059462762b339d2569
2017-10-17Handle RSA_R_DATA_TOO_LARGEShawn Willden
am: a32e1c8e5a Change-Id: I2fd5dafa78281038da16fa275b5249ae03182447
2017-10-16Mark the module as VNDK or VNDK-SP in Android.bp am: d6e1a40794 am: ↵Justin Yun
d7b48de669 am: 1d231967c9 -s ours am: 60290d6da1 -s ours Change-Id: I4b008eabfd1a24b61e7fb68f7ac76a303cabaa2f
2017-10-16Add libkeymaster_portable dependency am: 83fca99ff9 -s ours am: 30dcbf678a ↵Yifan Hong
-s ours am: 7583ae24cd -s ours am: 130b382c63 -s ours Change-Id: I9ef1191b6dde324f101293817aaaa6cff4ae2a4d
2017-10-16Add libkeymaster_messages dependency am: a286e939b9 -s ours am: 02077d1472 ↵Yifan Hong
-s ours am: 1c845e3289 -s ours am: 442dff24e1 -s ours Change-Id: I13fa3ff5856defa7538361c1b3d318837889bc0b
2017-10-16Add attestation app ID to attestation unit tests am: a972444c14 -s ours am: ↵Shawn Willden
e947686062 -s ours am: 3eb6ef0fc6 -s ours am: 51a2f9db64 -s ours Change-Id: I96c308dcb21f28b8058d33a7724b37d9a75d4548
2017-10-16Fix android_keymaster_test crashes. am: 9dd98de1d2 -s ours am: 47a2501f57 ↵Shawn Willden
-s ours am: 1b6278cc98 -s ours am: 5dc7cab437 -s ours Change-Id: I20810878d5447e937f989184ef3f9c0b1990b151
2017-10-16Rename libkeymaster to libkeymaster_staging am: d017f88c5a -s ours am: ↵Janis Danisevskis
968f98a051 -s ours am: 795873e034 -s ours am: 5788ffed53 -s ours Change-Id: Ia24a6d14989035ec4a97b20ebef245f25a38b697
2017-10-16Make keymaster more self contained am: 4427bbe0b4 -s ours am: 4707aa3a9a ↵Janis Danisevskis
-s ours am: 7c0b5b61eb -s ours am: 02f8d8a136 -s ours Change-Id: I60e81d76b13da2d903941788064ea409904257e6
2017-10-16Mark the module as VNDK or VNDK-SP in Android.bp am: d6e1a40794 am: d7b48de669Justin Yun
am: 1d231967c9 -s ours Change-Id: I4c1b00a032c57f2a6f72ff906bdcdc8166e4d85d
2017-10-16Add libkeymaster_portable dependency am: 83fca99ff9 -s ours am: 30dcbf678a ↵Yifan Hong
-s ours am: 7583ae24cd -s ours Change-Id: I0cf54692cdd5409df98a0a648124803ec075d9e8
2017-10-16Add libkeymaster_messages dependency am: a286e939b9 -s ours am: 02077d1472 ↵Yifan Hong
-s ours am: 1c845e3289 -s ours Change-Id: I32818091111b4a2f0821c32ac6184bf2efa3c53c
2017-10-16Add attestation app ID to attestation unit tests am: a972444c14 -s ours am: ↵Shawn Willden
e947686062 -s ours am: 3eb6ef0fc6 -s ours Change-Id: I6e88106d2553c68a5bce881a365ad39a572b32ae
2017-10-16Fix android_keymaster_test crashes. am: 9dd98de1d2 -s ours am: 47a2501f57 ↵Shawn Willden
-s ours am: 1b6278cc98 -s ours Change-Id: Idad52de632c65a4ce8920c6bec752531516c65ee
2017-10-16Rename libkeymaster to libkeymaster_staging am: d017f88c5a -s ours am: ↵Janis Danisevskis
968f98a051 -s ours am: 795873e034 -s ours Change-Id: I2d8e9daaec0c3f0c320946dbdfaa33f6db3d919b
2017-10-16Make keymaster more self contained am: 4427bbe0b4 -s ours am: 4707aa3a9a ↵Janis Danisevskis
-s ours am: 7c0b5b61eb -s ours Change-Id: Id62f65856a8400852c0176bfec114f293a81a04c
2017-10-16Mark the module as VNDK or VNDK-SP in Android.bp am: d6e1a40794Justin Yun
am: d7b48de669 Change-Id: I1ad6daada697e7fed77e426dac336d6e19638c8d
2017-10-16Add libkeymaster_portable dependency am: 83fca99ff9 -s oursYifan Hong
am: 30dcbf678a -s ours Change-Id: I38a2f723f7453b7edead22c9aaa1804c8d42a93c
2017-10-16Add libkeymaster_messages dependency am: a286e939b9 -s oursYifan Hong
am: 02077d1472 -s ours Change-Id: I52a60a6ed59ebfe68dc933394d956810d6900f1f
2017-10-16Add attestation app ID to attestation unit tests am: a972444c14 -s oursShawn Willden
am: e947686062 -s ours Change-Id: I0ce9de570fb816aa8224a2a869314de334e6afce
2017-10-16Fix android_keymaster_test crashes. am: 9dd98de1d2 -s oursShawn Willden
am: 47a2501f57 -s ours Change-Id: I66c20fe75b5af66917113761e60f5522cba5e8a8
2017-10-16Rename libkeymaster to libkeymaster_staging am: d017f88c5a -s oursJanis Danisevskis
am: 968f98a051 -s ours Change-Id: If6d02371cd0da129f4ad7011f16bb0bd86643fde
2017-10-16Make keymaster more self contained am: 4427bbe0b4 -s oursJanis Danisevskis
am: 4707aa3a9a -s ours Change-Id: Ifaebc2bf211982f50897c6942ea2f3b8a98c1484
2017-10-16Mark the module as VNDK or VNDK-SP in Android.bpJustin Yun
am: d6e1a40794 Change-Id: If9b0bfff552b7650c0009183af6467c7a0c5236d
2017-10-16Add libkeymaster_portable dependencyYifan Hong
am: 83fca99ff9 -s ours Change-Id: I5b8745d02254511e68edba8456af552fa0ee1123
2017-10-16Add libkeymaster_messages dependencyYifan Hong
am: a286e939b9 -s ours Change-Id: I66ee94291df732613fe5811f15d996d8a65e808a
2017-10-16Add attestation app ID to attestation unit testsShawn Willden
am: a972444c14 -s ours Change-Id: Ie3b2d25af2ede837c2a24f1954b7b5379586b06f
2017-10-16Fix android_keymaster_test crashes.Shawn Willden
am: 9dd98de1d2 -s ours Change-Id: I3885ac2ffa7c3d28ff965ea8f9c3c9fb40c4d08a
2017-10-16Rename libkeymaster to libkeymaster_stagingJanis Danisevskis
am: d017f88c5a -s ours Change-Id: I786f2dd688fc8134780cbc86c34ae7adf3b4f423
2017-10-16Make keymaster more self containedJanis Danisevskis
am: 4427bbe0b4 -s ours Change-Id: Ib5c8e0c5636b1e0b3bc7395a206914635ab35252
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 17:30:53 +0000