Iris Chang
784e993ef6
Merge "Fix Keymaster VTS for OpenSSL error code change" am: fc23356909 am: f9fceff665
...
am: 11fab4809b
2017-11-22 02:16:25 +00:00
Iris Chang
f9fceff665
Merge "Fix Keymaster VTS for OpenSSL error code change"
...
am: fc23356909
2017-11-22 02:04:08 +00:00
Treehugger Robot
fc23356909
Merge "Fix Keymaster VTS for OpenSSL error code change"
2017-11-22 01:55:27 +00:00
Ryan Campbell
6f62a49017
Transfer VTS test ownership. am: ae6b2a5f1e am: 8ca98990ab
...
am: 4596756e1b
2017-11-17 02:17:33 +00:00
Ryan Campbell
8ca98990ab
Transfer VTS test ownership.
...
am: ae6b2a5f1e
2017-11-17 02:10:09 +00:00
Ryan Campbell
ae6b2a5f1e
Transfer VTS test ownership.
...
Remove self from test ownership and transfer to new owners as agreed.
Test: none
Bug: 69425312
Change-Id: I8b189e6f2d7076b9ee7f3bad91445ccf6c5e1767
Merged-In: I8b189e6f2d7076b9ee7f3bad91445ccf6c5e1767
2017-11-16 14:48:00 -08:00
Iris Chang
890d3dfe27
Fix Keymaster VTS for OpenSSL error code change
...
OpenSSL changes error code of large RSA data from
KM_ERROR_INVALID_INPUT_LENGTH to KM_ERROR_INVALID_ARGUMENT which causes
HidlHalGTest#EncryptionOperationsTest.RsaOaepTooLarge and
HidlHalGTest#EncryptionOperationsTest.RsaPkcs1TooLarge tests failed.
Fix keymaster VTS to accept both the error codes.
Bug: 68289922
Test: HidlHalGTest#EncryptionOperationsTest.RsaOaepTooLarge and
HidlHalGTest#EncryptionOperationsTest.RsaPkcs1TooLargeHidlHalGTest#EncryptionOperationsTest.RsaOaepTooLarge
and HidlHalGTest#EncryptionOperationsTest.RsaPkcs1TooLarge are
passed after applying this modification and other Keymaster 3.0
VTS test cases are not affected.
Change-Id: I493bfa1c6e4b69560dfae3585a416b5c3d33e215
2017-11-15 08:09:52 +00:00
Xin Li
bb9e38fef9
Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
8db261bc99
Updating makefiles for hidl_interface.
...
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Steven Moreland
a1169dd600
Update makefiles for hidl_interface.
...
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
1d7374c5e1
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
...
am: 116161d94e
2017-10-11 16:39:21 +00:00
Steven Moreland
116161d94e
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
...
am: 6c811964a1
2017-10-11 16:31:07 +00:00
Steven Moreland
6c811964a1
Update for Soong java makefiles. am: c3e80fa01e
...
am: 0fff75dee1
2017-10-11 16:27:24 +00:00
Steven Moreland
0fff75dee1
Update for Soong java makefiles.
...
am: c3e80fa01e
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e
Update for Soong java makefiles.
...
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Iris Chang
13edc1a4d3
Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7f am: b87becf1c2 am: 7fdf8d791f
...
am: 41df3d9063
2017-10-06 01:55:09 +00:00
Iris Chang
41df3d9063
Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7f am: b87becf1c2
...
am: 7fdf8d791f
2017-10-06 01:53:28 +00:00
Iris Chang
7fdf8d791f
Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7f
...
am: b87becf1c2
2017-10-06 01:51:40 +00:00
Iris Chang
b87becf1c2
Merge "VTS: fix VtsHalKeymasterV3_0Target issue"
...
am: 1912c73a7f
2017-10-06 01:49:29 +00:00
Treehugger Robot
1912c73a7f
Merge "VTS: fix VtsHalKeymasterV3_0Target issue"
2017-10-06 01:43:54 +00:00
Iris Chang
54ca32a130
VTS: fix VtsHalKeymasterV3_0Target issue
...
Failed cases:
AttestationTest.RsaAttestation
AttestationTest.EcAttestation
Analysis:
The verify_attestation_record() in Keymaster_hidl_hal_test.cpp calls
parse_attestation_record() to set the value of att_challenge. It fails
to compare att_challenge with challenge by memcmp.
Because setToExternal() method uses buffer pointer to local variable
(record), not use memcpy to copy into itself buffer in
parse_attestation_record(). When it leaves the parse_attestation_record(),
we will get the att_challenge which is null buffer to compare with challenge
incorrectly.
Fix: use memcpy to copy the buffer.
Bug: 65039571
Test: build passed. VtsHalKeymasterV3_0Target -> PASSED: 106, FAILED: 0.
Change-Id: I700a9242cc9a5f4cb196b62860823601e4088531
2017-10-06 00:45:42 +00:00
Steven Moreland
70bfb9d250
Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
...
am: 9a17f41f6f
2017-10-04 21:54:11 +00:00
Steven Moreland
9a17f41f6f
Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
...
am: b53e6ad535
2017-10-04 21:51:00 +00:00
Steven Moreland
b53e6ad535
Merge "Update for hidl adapter module defaults." am: 988c977079
...
am: 861651985f
2017-10-04 21:48:04 +00:00
Steven Moreland
861651985f
Merge "Update for hidl adapter module defaults."
...
am: 988c977079
2017-10-04 21:45:09 +00:00
Steven Moreland
527fd76a0e
Update for hidl adapter module defaults.
...
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Janis Danisevskis
5a07ed4802
Switch to new NG AndroidKeymaster3Device
...
Test: VtsHalKeymasterV3_0TargetTest
Bug: 67358942
Change-Id: Idc7ac599c359b3af2e4866b9eb446a05e96132a0
2017-10-03 16:13:21 -07:00
Janis Danisevskis
b17178a1a4
Fix wrong origin assumption for wrapped KM0 hals
...
KM0 supports only asymmetric encryption. And for those we cannot
distinguish between imported and generated keys.
This patch adds correct handling for KM0 origin tags.
Test: run vts test with wrapped km0 module from
system/security/softkeymaster
Bug: 67358942
Bug: 67363396
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I7f5ddd21dde284dbfbd68b3b83fb75c1457dbd59
2017-10-03 16:13:21 -07:00
Janis Danisevskis
957b1dc654
Reflect: Removed KeymasterEnforcement dependencies on openssl
...
in system/keymaster.
Test: VtsHalKeymasterV3_0TargetTest
Bug: 67358942
Change-Id: Ie3e1fb94a299635e6c7cf45d78822b03bedf5d11
2017-10-03 16:13:21 -07:00
Janis Danisevskis
7e03f98bd2
Software keymaster attestations return 3 as keymaster version
...
Bug: 67358942
Bug: 67359348
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: Ia04a55b407343ddddd4467c401ee2556e8fe9bd9
2017-10-03 16:13:21 -07:00
Janis Danisevskis
1235d348e6
Relax finish result on RSA operations
...
Some RSA operation tests expect ErrorCode::INVALID_ARGUMENT
and others ErrorCode::INVALID_INPUT_LENGTH for the same
diagnosed syndrome, i.e., the input message was too long.
This patch relaxes the expectations on one of these tests
expecting ErrorCode::INVALID_INPUT_LENGTH, to also accept the
more consistent ErrorCode::INVALID_ARGUMENT.
Bug: 67358942
Bug: 67359132
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I573d3a01b052f0256611064f23ae791007cf7122
2017-10-03 16:13:20 -07:00
Janis Danisevskis
02bc2768d4
Add OWNERS files to keymaster resources am: e6014f69ea am: 1ff3510d29 am: 2d83c98987
...
am: a0e1f49a11
2017-10-03 22:31:13 +00:00
Janis Danisevskis
a0e1f49a11
Add OWNERS files to keymaster resources am: e6014f69ea am: 1ff3510d29
...
am: 2d83c98987
2017-10-03 21:47:46 +00:00
Janis Danisevskis
2d83c98987
Add OWNERS files to keymaster resources am: e6014f69ea
...
am: 1ff3510d29
2017-10-03 21:35:50 +00:00
Janis Danisevskis
1ff3510d29
Add OWNERS files to keymaster resources
...
am: e6014f69ea
2017-10-03 21:22:58 +00:00
Janis Danisevskis
e6014f69ea
Add OWNERS files to keymaster resources
...
This patch adds swillden@ and jdanis@ as owners of keymaster/3.0/vts
and keymaster/3.0/default.
Test: No code changed
Change-Id: I04bc0f741e8fafd53aee7c9dd62954548b81263d
2017-10-03 13:37:19 -07:00
Steven Moreland
91799c6cc7
Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
...
am: 9fdd241905
2017-09-27 00:02:52 +00:00
Steven Moreland
9fdd241905
Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
...
am: 71a193a425
2017-09-26 23:58:51 +00:00
Steven Moreland
71a193a425
Merge "Fix typo in update makefiles." am: 9960148420
...
am: f07e364ce3
2017-09-26 23:55:59 +00:00
Steven Moreland
f07e364ce3
Merge "Fix typo in update makefiles."
...
am: 9960148420
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739
Fix typo in update makefiles.
...
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
7741c0e17b
Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
...
am: 97228c0b7d
2017-09-26 13:36:09 +00:00
Steven Moreland
97228c0b7d
Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
...
am: b94d0c7290
2017-09-26 12:53:13 +00:00
Steven Moreland
b94d0c7290
Update makefiles for hidl adapter. am: 26a0bb2762
...
am: 73949c1d7e
2017-09-26 12:48:40 +00:00
Steven Moreland
73949c1d7e
Update makefiles for hidl adapter.
...
am: 26a0bb2762
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762
Update makefiles for hidl adapter.
...
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Shawn Willden
b4766e598b
Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4
...
am: 64978d763d
2017-09-12 16:37:22 +00:00
Shawn Willden
64978d763d
Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079
...
am: 35e1be70b4
2017-09-12 16:34:52 +00:00
Shawn Willden
35e1be70b4
Merge "Don't send more than 2K to addRngEntropy" into oc-dev
...
am: 7eeb6b5079
2017-09-12 16:31:32 +00:00
TreeHugger Robot
7eeb6b5079
Merge "Don't send more than 2K to addRngEntropy" into oc-dev
2017-09-12 16:28:44 +00:00
