summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-25Move keystore to foreground cpuset.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseMartijn Coenen
am: 1140ef6 * commit '1140ef674e2098bb3ac4360baafb1562760b441c': Move keystore to foreground cpuset. Change-Id: Ie5c786addde44b44184ddc8ae73aaf9504430fd5
2016-04-15Move keystore to foreground cpuset.nougat-devMartijn Coenen
Bug: 24949295 Change-Id: Iaade68c5216d0efabdfdec4ff2b61d778d319324
2016-03-29Implement key upgrade in keystore.Shawn Willden
Change-Id: I0cf169d9366aee1de32f1cc4501af76e6e1bc505
2016-03-29Configure keymaster with OS version info.Shawn Willden
Change-Id: Ia09591dbea04ff5d45370b47341efa5bf34604ce
2016-03-25Fix AuthTokenTable tests.Shawn Willden
The local unit test bit-rotted. This fixes it. Change-Id: I37c8dbd894b69f3a48aefdd4f71339c45d571f6b
2016-02-08Actually pass attestation requests through to keystore.Shawn Willden
Bug: 22914603 Change-Id: I49f2386943c90cd29a80556fd48087793dd5ca66
2016-02-02Fix various memory errors.Shawn Willden
Bug: 26910835 Change-Id: I2973221a798b08bbde6dc7ac5464a99b2dc26b4d
2016-01-28Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8Shawn Willden
am: e30ca16ae0 * commit 'e30ca16ae0e41375201de9132866f5680a5d7baa': Add KM_TAG_ALLOW_WHILE_ON_BODY Add attestation support to keystore.
2016-01-28Merge changes from topic \'km_tag_allow_on_body\'Shawn Willden
am: a1433ee2f8 * commit 'a1433ee2f85ae9d2db4e9eb996b6b23af1542247': Add KM_TAG_ALLOW_WHILE_ON_BODY Add attestation support to keystore.
2016-01-28Merge changes from topic 'km_tag_allow_on_body'brillo-m10-releasebrillo-m10-devShawn Willden
* changes: Add KM_TAG_ALLOW_WHILE_ON_BODY Add attestation support to keystore.
2016-01-27Add KM_TAG_ALLOW_WHILE_ON_BODYShawn Willden
Actually, this change eliminates the need to update keystore_cli_v2 every time a tag is added, which also has the effect of supporting KM_TAG_ALLOW_WHILE_ON_BODY. Change-Id: I15dd4ec4b7cab52dba43ec5d0afc6f8caf922389
2016-01-27Add attestation support to keystore.Shawn Willden
Bug: 22914603 Change-Id: I14fbfbe30b96c5c29278fa548e06b65f15942fe2
2016-01-27Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5Shawn Willden
am: f647e0a994 * commit 'f647e0a99492d21825e891c53b9a05fed04dbb9c': Update Keystore to use keymaster2 HAL.
2016-01-27Merge "Update Keystore to use keymaster2 HAL."Shawn Willden
am: fd50293cd5 * commit 'fd50293cd5f91936ea954b0556f3f434243adf27': Update Keystore to use keymaster2 HAL.
2016-01-27Merge "Update Keystore to use keymaster2 HAL."Shawn Willden
2016-01-26Refactor keystore.Shawn Willden
This CL isn't nearly as big as it looks. It doesn't change keystore functionality, it just moves all of the classes out of the former keystore.cpp into their own .h and .cpp files. Note that this is a cherry-pick from: https://android-review.googlesource.com/#/c/194971 Change-Id: Ide326c4f1d03984994d1bd9a76fa68d37da230dc
2016-01-26Merge "Refactor keystore." am: e4f2fa54b0Shawn Willden
am: 63e1e79476 -s ours * commit '63e1e794768d2960f95b569ad587847d7e14b8ba': Refactor keystore.
2016-01-26Merge "Refactor keystore."Shawn Willden
am: e4f2fa54b0 * commit 'e4f2fa54b009838f72219735d692d84d062a0177': Refactor keystore.
2016-01-26Merge "Refactor keystore."Shawn Willden
2016-01-26Update Keystore to use keymaster2 HAL.Shawn Willden
This CL doesn't wire in any of the new keymaster2 features, it just uses the keymaster2 HAL rather than the keymaster1 HAL. This means that if keymaster1 hardware is found, it is unconditionally wrapped in SoftKeymasterDevice, so keymaster2 functionality can (eventually) be provided. Change-Id: Ica2cb0751e4e0a82c56c36b03f94da54ef62d9a3
2016-01-26Refactor keystore.Shawn Willden
This CL isn't nearly as big as it looks. It doesn't change keystore functionality, it just moves all of the classes out of the former keystore.cpp into their own .h and .cpp files. Change-Id: I29a1ce21bff574be56128b32fc417e5a3d3c55fb
2016-01-26keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s oursBaligh Uddin
am: de4e6af56d * commit 'de4e6af56d25d0cfbbed736f6f125e5c6aac4d58':
2016-01-26keep history after reset to mnc-dr-devBaligh Uddin
am: d1b3dc5f63 -s ours * commit 'd1b3dc5f636067f47fd1ec97d5ba89fd0ac9f710':
2016-01-25keep history after reset to mnc-dr-devandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releaseBaligh Uddin
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2Shawn Willden
am: 9eedb2e603 * commit '9eedb2e60307856dafc53ed4331708ce70c89df3': Update keystore_cli_v2 for keymaster_defs changes.
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes."Shawn Willden
am: 93c57ca1b2 * commit '93c57ca1b243c2cb4a6e516b1f99e7aed407e53a': Update keystore_cli_v2 for keymaster_defs changes.
2016-01-25Merge "Update keystore_cli_v2 for keymaster_defs changes."Shawn Willden
2016-01-20Update keystore_cli_v2 for keymaster_defs changes.Shawn Willden
Change-Id: I6a584c8f0ae7a0461ea33836f0ca15bc89f2367f
2015-12-23Merge "Limit maximum number of concurrent keystore operations." am: ↵Shawn Willden
108a5d34b5 am: 80b09638de am: 6e645e0e7e * commit '6e645e0e7ee687ababf5700e36b271700580de88':
2015-12-23Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6Shawn Willden
am: 5a02a61066 * commit '5a02a610665a5ef7a14655651aac1da80da7e5dd':
2015-11-26Merge "Limit maximum number of concurrent keystore operations." am: ↵Shawn Willden
108a5d34b5 am: 80b09638de am: b0adba8170 * commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b': Limit maximum number of concurrent keystore operations.
2015-11-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5Shawn Willden
am: 80b09638de * commit '80b09638de3571d2c12aa3d6e3d22682fc431b72': Limit maximum number of concurrent keystore operations.
2015-11-23Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5Shawn Willden
am: 80b09638de * commit '80b09638de3571d2c12aa3d6e3d22682fc431b72': Limit maximum number of concurrent keystore operations.
2015-11-23Merge "Limit maximum number of concurrent keystore operations."brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devShawn Willden
am: 108a5d34b5 * commit '108a5d34b5ce181dff52906a66862ec084841ec4': Limit maximum number of concurrent keystore operations.
2015-11-23Merge "Limit maximum number of concurrent keystore operations."Shawn Willden
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6Shawn Willden
am: 347c9b233e * commit '347c9b233e0f0f03ad3b48d5b512a990934914dc': ECIES: adding ECIES-KEM
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068Shawn Willden
am: e5f3a444f6 * commit 'e5f3a444f692f2d61d54783021551bb82c56e507': ECIES: adding ECIES-KEM
2015-11-23Merge "ECIES: adding ECIES-KEM" am: ab42146068Shawn Willden
am: e5f3a444f6 * commit 'e5f3a444f692f2d61d54783021551bb82c56e507': ECIES: adding ECIES-KEM
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
am: ab42146068 * commit 'ab421460681045f2037552611ece53ea08f9ebc5': ECIES: adding ECIES-KEM
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23Limit maximum number of concurrent keystore operations.Shawn Willden
Bug: 25312003 Change-Id: I3bcae59c6a79d5f7d2e2f432251bb7b818f57581
2015-11-23ECIES: adding ECIES-KEMShawn Willden
Change-Id: I9f4dd30786f5de170c2e12c1cff52b9ecbb26a2c
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 am: ↵Darren Krahn
6c4a59b0f8 am: bd6db0b4ab * commit 'bd6db0b4ab6b1175e5542cd0d93811ce56931cb5': keystore: Add a test suitable for Brillo PTS.
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895Darren Krahn
am: 6c4a59b0f8 * commit '6c4a59b0f8c09db267d71313413ceaa7713924bb': keystore: Add a test suitable for Brillo PTS.
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS."Darren Krahn
am: 296727f895 * commit '296727f895b37f5647618bd1b486de6faa5ed423': keystore: Add a test suitable for Brillo PTS.
2015-11-10Merge "keystore: Add a test suitable for Brillo PTS."Darren Krahn
2015-11-09keystore: Add a test suitable for Brillo PTS.Darren Krahn
The test can be run with the command: keystore_cli_v2 brillo-platform-test Test results will be printed to stdout and the exit code will be the number of failed tests. BUG=24751339 Change-Id: I2cfe2ca034fa3aa76e7f39488ebbf40482ecb5b9
2015-11-09Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943cNick Kralevich
am: b98232f489 * commit 'b98232f48983e3c874df3eae15a612005ee1f509': Add keystore to AID_READPROC
2015-11-09Merge "Add keystore to AID_READPROC" am: 641c6299e5Nick Kralevich
am: 0768b9943c * commit '0768b9943cc0b4f8377eafb9486f4f17177378ed': Add keystore to AID_READPROC
2015-11-09Merge "Add keystore to AID_READPROC"Nick Kralevich
am: 641c6299e5 * commit '641c6299e51d517bd27149069be39f7770c76234': Add keystore to AID_READPROC
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 07:50:18 +0000