summaryrefslogtreecommitdiffstats
path: root/keymaster
Commit message (Collapse)AuthorAgeFilesLines
* Merge "./update-makefiles.sh, for union changes/memory" am: 00daede4d5 am: ↵Steven Moreland2019-11-261-0/+1
|\ | | | | | | | | | | | | | | 0942e33017 am: 87fe284668 Change-Id: I3a331b5e1c5418426a084f1c7bfe436214a1b68f
| * ./update-makefiles.sh, for union changes/memorySteven Moreland2019-11-261-0/+1
| | | | | | | | | | | | | | | | Many more types can be used in Java. Bug: 143566068 Test: N/A Change-Id: Ie18e1e0f9c22f2ea15b755df3b048c9d651c4945
* | Merge changes from topic "add-km-41" am: f66777ad50 am: 7f7e9608dcShawn Willden2019-11-2114-0/+456
|\| | | | | | | | | | | am: 78926e3375 Change-Id: I7964555358e9150d58f53eb154ee7acf5eea1a78
| * Add Keymaster 4.1Shawn Willden2019-11-2014-0/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | Note that CL is missing complete tests (what's included is just a stub, really) and support library code. All of that will come in near-future CLs. This CL omits them because they'll take time and there's a need to unblock Keymaster 4.1 implementers now. Bug: 140193672 Bug: 140192237 Bug: 140824829 Test: Will be in a future CL Change-Id: I0e6e3a38356f0517158a10604b549415641ad1b9
* | Merge "Added LargeFinishInput test" am: 0cd9dd3893 am: 2b7a5caaf1Rob Barnes2019-11-151-0/+51
|\| | | | | | | | | | | am: e5567ae93d Change-Id: I2f7cd04aef3847dfebc6dda8ad335858283f167b
| * Merge "Added LargeFinishInput test"Rob Barnes2019-11-151-0/+51
| |\
| | * Added LargeFinishInput testRob Barnes2019-11-141-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | This tests passing a large input to finish. This should either succeed or fail with the right error code. Test: Run new VTS test Change-Id: Ic4ef90adc6274317796bbe752f95fc9efa5fdb07
* | | Merge "Adding test to check another ASN.1 Encoding Case" am: 8fb7cbd26b am: ↵Max Bires2019-11-141-19/+23
|\| | | | | | | | | | | | | | | | | | | | | | | 2e220a7507 am: 2dd6fa731b Change-Id: I35f3a58b3299c2cff56f829f0efececd0f5f8045
| * | Merge "Adding test to check another ASN.1 Encoding Case"Treehugger Robot2019-11-141-19/+23
| |\ \ | | |/ | |/|
| | * Adding test to check another ASN.1 Encoding CaseMax Bires2019-11-121-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will check that the length of the attestation application id field will be properly encoded in valid DER ASN.1 in cases where the length is long enough to require extra bytes to encode. In those cases, the encoding of that field should include: -A byte to specify how many bytes are required to enumerate the length -The bytes required to enumerate the length -The actual data that follows Bug: 142674020 Test: atest keymaster_hidl_hal_test Change-Id: I6d162efa4c8c6e0922989e234d0377caf3c1758e
* | | Merge "Removing invalid HMAC tests." am: b09819f2da am: 2557502d5eMax Bires2019-11-121-83/+0
|\| | | | | | | | | | | | | | | | | am: 6c54a3df7e Change-Id: I68f5ba01fc1d3357263dfbc54aca9f72e3dc8297
| * | Removing invalid HMAC tests.Max Bires2019-11-071-83/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Per Keymaster 4.0 spec, TEE and StrongBox implementations are only required to support HMAC keys between 64 and 512 bits in length. StrongBox implementations additionally must not support anything larger than 512 bits. The tests removed in this CL specified key sizes larger than 512 bits. Bug: 143404829 Test: m VtsHalKeymasterV4_0TargetTest && adb sync data && \ adb shell data/nativetest64/VtsHalKeymasterV4_0TargetTest/VtsHalKeymasterV4_0TargetTest Change-Id: I96ee3a20b981c288d88366f536b9924f907268f3
* | Merge "Adding jbires to VTS OWNERS" am: 9756532b64 am: 3137c54d4f am: 7558ead96cMax Bires2019-10-251-0/+1
|\| | | | | | | | | | | am: c70d259d06 Change-Id: Id6b967b677d60eaf49dcce53b9b1dd19f9f2ff9d
| * Merge "Adding jbires to VTS OWNERS"Treehugger Robot2019-10-251-0/+1
| |\
| | * Adding jbires to VTS OWNERSMax Bires2019-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | Added OWNERS entry for Keymaster 4.0 VTS changes. Test: jbires can +2 changes in VTS Change-Id: I152d1e9f6fa7a021caa83d4b74beddde03384331
* | | Merge "Adding test to check that ASN.1 lengths are properly encoded" am: ↵Max Bires2019-10-241-0/+29
|\| | | | | | | | | | | | | | | | | | | | | | | c6b086785d am: b3ee534556 am: 96098b0cd9 am: 995fa3dbe8 Change-Id: I8eb3a3b80f219a050250eb266949978d531bf3fb
| * | Adding test to check that ASN.1 lengths are properly encodedMax Bires2019-10-161-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test checks that length metadata for the ASN.1 encoding of attestation application ids are correct. It generates an app id that will have a length between 127 and 256, which should create an encoding that requires two bytes of length metadata - one byte to specify how many bytes are needed for the length, and one byte for the length. Some implementations of keymaster only use one byte in this case, which will fail on strict ASN.1 parsers. Bug: 142674020 Test: m VtsHalKeymasterV4_0TargetTest && adb sync data \ && adb shell data/nativetest64/VtsHalKeymasterV4_0TargetTest/VtsHalKeymasterV4_0TargetTest Change-Id: I7dfc38a09247eb3cb237f33a202044668d15cbca
* | | Fix UB in class NullOr am: cf5d7e83fd am: 24db85e33e am: 51bbd6719bJanis Danisevskis2019-10-101-24/+35
|\| | | | | | | | | | | | | | | | | am: 6f630d198f Change-Id: Id21d0cfa6852dda9f0158f233063c462989b93f4
| * | Fix UB in class NullOrJanis Danisevskis2019-10-101-24/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | NullOr now stores the references a pointers internally. This fixes UB where the internal reference was initalized by dereferencing nullptr. Test: Compiles Bug: 121390225 Change-Id: I2073e5aeac401309aa63b08e05db3c467fab6b69
* | | Merge "Add Keymaster VTS tests for some AES cases:" am: 772fb53999 am: ↵Rob Barnes2019-10-023-0/+136
|\| | | | | | | | | | | | | | | | | | | | | | | 0baa38ed55 am: 0eb84f484a am: e70544b15c Change-Id: Id496d05e590aa8e1e9f2c78bdc21306e8c839faa
| * | Merge "Add Keymaster VTS tests for some AES cases:"Treehugger Robot2019-10-023-0/+136
| |\ \
| | * | Add Keymaster VTS tests for some AES cases:Rob Barnes2019-09-193-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. AES operation attempted with unauthorized purpose. 2. AES-GCM encryption performed with different nonces, should generate different ciphertexts. 3. AES-GCM encryption decryption round trip with delays between begin and update and finish. Bug: 133258003 Test: VtsHalKeymasterV4_0TargetTest Change-Id: Ia8b4b4b317ecff51b18e64dfa3b84bf77475812d
* | | | Merge "Added VTS tests for clearing operation slots after service death." ↵Rob Barnes2019-10-013-5/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fd877b5479 am: 2b3640a442 am: 89cd80c9da am: f610e72c81 Change-Id: Ie2c68f4195d494a1c5af712234f6a7d98c98892e
| * | | Merge "Added VTS tests for clearing operation slots after service death."Rob Barnes2019-10-013-5/+101
| |\ \ \
| | * | | Added VTS tests for clearing operation slots after service death.Rob Barnes2019-09-103-5/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/139689895 TEST: Added VTS tests to keymaster_hidl_hal_test.cpp TEST: Ran on emulator against soft keymaster::v4_0::ng Change-Id: I6c682cafee65cf7ea426bd03865bf868586efc62
* | | | | Merge "Use libcrypto_static instead of libcrypto" am: c048c187be am: ↵Colin Cross2019-09-262-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06b758a918 am: 978e59e401 am: 135b3a4417 Change-Id: I2ae264a5c9998b7c6a2a4bb868e313161f1a3701
| * | | | Use libcrypto_static instead of libcryptoColin Cross2019-09-182-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace libcrypto with libcrypto_static, which can be protected through visibility to ensure only modules that don't affect FIPS certification can use it. Bug: 141248879 Test: m checkbuild Change-Id: I8685cb06d15f3425eeb96d998ffda54c82dcd387
* | | | Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: ↵Steven Moreland2019-09-063-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c22c3862f am: 6684ee8c36 am: 9a5ffa3196 Change-Id: I3a80895d10767fe68e90a907312a83ded976cbcc
| * | | Remove libhwbinder/libhidltransport depsSteven Moreland2019-09-063-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
* | | | Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE" am: ↵Max Bires2019-08-231-63/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28a7fed681 am: dddf75c01b am: 28446e0722 am: 9031031e47 am: eb651fa35d Change-Id: Ic920d776365bbd94d2cb9031760ee4a3eec417c2
| * | | Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE"Max Bires2019-08-231-63/+44
| |\| | | | | | | | | | | | | | | | | | | | | | am: 28a7fed681 Change-Id: I48327bcf5effe56e5f57fa53092cde6c10c62ecd
| | * | Adding testing functionality for TAG_ROLLBACK_RESISTANCEMax Bires2019-08-151-63/+44
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to changes in implementation between keymaster 3.0 and 4.0, rollback resistance is now specified by the caller. This patch addresses that inconsistency to make sure rollback resistance is properly tested. If rollback resistance is supported by the hardware, then it will now be tested. Test: atest VtsHalKeymasterV4_0TargetTest Change-Id: I21e8d1e66932ddfad2d42ce8a43591431f3ff284
* | | Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616 am: ↵Felix2019-07-082-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | 3531ec0183 am: bf481c99ed Change-Id: Ie44e2aa87f7407a9820dc6f1ad6298b61bae34f3
| * | Merge "Add interface info to .rc files"Felix2019-07-082-0/+2
| |\| | | | | | | | | | | | | | | | am: 98d0f4d52c Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
| | * Add interface info to .rc filesFelix2019-06-252-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Felix <google@ix5.org> Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
| | * Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."Xin Li2019-05-171-0/+27
| | |\
* | | | Merge "keymaster: Relax testing under GSI" into qt-dev am: d10841a83d am: ↵nagendra modadugu2019-06-291-32/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eec090610b am: 7ad0166631 Change-Id: I03ecf5d514221673891486bcc06e6b512e6c6a3e
| * | | Merge "keymaster: Relax testing under GSI" into qt-devnagendra modadugu2019-06-291-32/+45
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: d10841a83d Change-Id: If435ebd75ee04f1f6ea6324437683713b85a613a
| | * | | keymaster: Relax testing under GSInagendra modadugu2019-06-291-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GSI images do not have AVB verification enabled and therefore lack several properties the keymaster HAL test depended on. Selectively disable those parts of the test that would fail with AVB verification disabled. Also disable date format checks under GSI. When invoked from GSI the TEE-backed keymaster doesn't use the correct date format. Bug: 130843899 Test: VtsHalKeymasterV4_0TargetTest Exempt-From-Owner-Approval: change only affects VTS-on-GSI behavior Change-Id: Idaafb7b515c41290c766a8132f35d498ca15f48a
| * | | | Merge "Increase leniency of attestation record timestamps" into qt-devGarret Kelly2019-06-251-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6c4e33d079 Change-Id: I741568f862d553a92344618406f0fb2f7a3d46f5
* | | | | Merge "Increase leniency of attestation record timestamps" into qt-dev am: ↵Garret Kelly2019-06-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c4e33d079 am: 89fda5c7f9 am: 4684c6f469 Change-Id: I6a10db36c762a589cc04ac7bac7f01cec603f7d8
| * \ \ \ \ Merge "Increase leniency of attestation record timestamps" into qt-dev am: ↵Garret Kelly2019-06-251-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | 6c4e33d079 am: 89fda5c7f9 Change-Id: I063e8cd6e53da1af4a50df9273a5ada4b9e7ea87
| | * | | Increase leniency of attestation record timestampsGarret Kelly2019-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TEE keymaster has been seen to be almost a minute out of sync with the host clock during attestation. Increase the leniency window to two minutes. Bug: 134408892 Bug: 134408367 Test: VtsHalKeymasterV4_0TargetTest Change-Id: Ic256a939dcd7e7b108099cfcf237cacde8dde059
| * | | | Merge "Removing an extraneous test" into qt-devMax Bires2019-06-171-22/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 16b2c77456 Change-Id: I2bd55543991178bf313996841e51aff838986a5c
| | * | | Removing an extraneous testMax Bires2019-06-171-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: VTS passes Bug: 133316458 Change-Id: I98d73ff025515a89e2743ed20950c840aedb5114 (cherry picked from commit b28e69f37efe8d569db2a3fc9dd9c633c0ab8ba5)
* | | | | Keymaster memory management is inconsistentJanis Danisevskis2019-06-142-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object derived from RefBase must be owned by sp rather then other smart pointer implementations. Bug: 79474587 Change-Id: I866f67e1cb091efb3026450d50a410b5985539b6
* | | | | Merge "Removing an extraneous test"TreeHugger Robot2019-05-301-22/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removing an extraneous testMax Bires2019-05-221-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: VTS passes Bug: 133316458 Change-Id: I98d73ff025515a89e2743ed20950c840aedb5114
| * | | | Expanding VTS test coverageMax Bires2019-04-085-10/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keymaster VTS test coverage on 4.0 was incomplete. This significantly expands the coverage of the spec. The bugs listed are errors found that these tests will cover, but are not indicative of the complete set of things tested. Test: atest VtsHalKeymasterV4_0TargetTest Bug: 79953279 Bug: 119553313 Bug: 119541233 Bug: 119396995 Bug: 119542230 Bug: 119549128 Bug: 119549677 Bug: 122184852 Bug: 122261372 Change-Id: I42d78091b48398597bbebe1d9c91b806494ddf4c
* | | | | Merge "listByInterface -> listManifestByInterface" am: 877c7f5ce1Steven Moreland2019-05-161-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5427525c6b Change-Id: I780f4cdd4c01b89af28d81c21111053ffdde99df
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 15:24:47 +0000