Zhuoyao Zhang
14ab40b9e7
Convert keymaster hal test to use VtsHalHidlTargetTestEnvBase
...
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalKeymasterV3_0Target
Change-Id: I6f245996749a53418b71f516ba782fe9d4321501
2018-02-10 12:40:25 -08: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
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
a1169dd600
Update makefiles for hidl_interface.
...
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08: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
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
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
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
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
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
Shawn Willden
e5266362e9
Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a
...
am: ac06f7576e
2017-09-12 06:53:16 +00:00
Shawn Willden
859db2ba9e
Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03a
...
am: ac06f7576e
2017-09-12 06:53:16 +00:00
Shawn Willden
ac06f7576e
Merge "Reduce max keymaster message size to 2K" into oc-dev
...
am: 42d61ce03a
2017-09-12 06:50:47 +00:00
Shawn Willden
02ffb2be41
Don't send more than 2K to addRngEntropy
...
Bug: 63745893
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I136920d3b62e026b22fbe06594bc40ccddc57dc3
(cherry picked from commit 3e1267edf0
2017-08-30 22:13:30 +00:00
Steven Moreland
dfd8287506
Updating all makefiles.
...
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
ff308ea6ba
Updating all makefiles.
...
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Tri Vo
c20d4caa4c
Merge "Keymaster test statically links to dependencies." into oc-mr1-dev
2017-08-11 01:07:22 +00:00
Tri Vo
0631f8ea9a
Keymaster test statically links to dependencies.
...
This test now statically links to libs not guaranteed to be on the
device.
Bug: 64040096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalKeymasterV3_0Target
Change-Id: I6a7b8c116153f18f61a71e5b5bef98343a4de43b
2017-08-10 20:18:36 +00:00
Justin Yun
608d773ef8
Update make file for vndk enabled.
...
Update the Android.bp generated with hidl-gen.
Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Shawn Willden
703c242322
Reduce max keymaster message size to 2K
...
Bug: 63745895
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I9b8c2e551f04bd2124462095f232bd08ff1f63c6
2017-08-03 20:45:46 +00:00
Tri Vo
f5d136c231
Update Android.bp HIDL makefiles
...
Allow HAL definition libs to be static.
Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Shawn Willden
6715433ca7
Merge "Test import of a EC P-521 key." into oc-dev
...
am: ad40c6ccd7
2017-06-23 15:39:19 +00:00
Shawn Willden
709e2e1ed9
Test import of a EC P-521 key.
...
This failure is also diagnosed by CTS, but it should be validated in VTS
as well.
Merged-In: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
Bug: 33945114
Test: adb shell data/nativetests64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest
Change-Id: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
2017-06-22 15:14:30 -06:00
