Commit graph

28726 commits

Author SHA1 Message Date
Treehugger Robot
006bdf3fa9 Merge "Fix for the documentation in TimeStampToken.aidl. HMAC computation will always use 1, which is the value of SecurityLevel.TRUSTED_ENVIRONMENT. This is done for backwards compatibility purpose. Test: N/A Bug: None." 2021-06-01 17:18:21 +00:00
David Zeuthen
a0752ce6de identity: Fix VTS test failure caused by unrelated change to system/keymaster.
Bug: 189447009
Test: atest VtsHalIdentityTargetTest
Test: atest CtsIdentityTestCases
Change-Id: I58426f1551efa920909c759cf5e10f44c6cfc5d4
2021-06-01 09:57:48 -04:00
Slava Shklyaev
2980a7c9fc Modify VTS to allow testing shim caching
Bug: 185777967
Bug: 182877255
Test: VtsHalNeuralnetworksTargetTest
Change-Id: Ibaba149715cfd5e655ce4916b75a29473170f013
2021-06-01 12:41:41 +01:00
Eran Messeri
90747ad701 Improve unique attestation docs & tests
Improve the documentation and tests related to device-unique
attestation on StrongBox KeyMint devices:
* Test that the chain produced is exactly of length 2.
* Document how the chain needs to be structured.
* Explain the trust properties of the key used for the
  self-signed root.

Test: atest VtsAidlKeyMintTargetTest
Bug: 187803288
Change-Id: I09bb16d6938b567c114485d2df00bde9d3e1ccf9
2021-05-27 18:19:18 +01:00
Max Bires
314b21f39a Updating CDDL schemas to match the finalized spec.
This primarily updates CDDL to allow for OEMs who wish to use P256
instead of Ed25519 to do so. One structural change of note that affects
all implementors is that SignedMacAad now includes the tag from the
COSE_Mac0 of MacedKeysToSign to prevent a potential vulnerability that
would exist if an attacker compromised the server's EEK private key.

Bug: 189018262
Test: Purely a comment change
Change-Id: I043a19c6aba0f771315d45c04ab5263b610b5de8
Merged-In: I043a19c6aba0f771315d45c04ab5263b610b5de8
2021-05-27 01:11:15 +00:00
Max Bires
8dff0b3584 Fixing tests to reflect change in CDDL
This fixes up the tests to go along with the change to the signature
of the MAC key. Primarily, this adds the MAC tag from the MACing
operation over the public key set to be signed into the AAD of the
signature of said MAC key.

Bug: 189018262
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ibdcf242e0ae73dee1a08fe98d939130055e4492e
Merged-In: Ibdcf242e0ae73dee1a08fe98d939130055e4492e
2021-05-26 21:42:17 +00:00
Treehugger Robot
302b92e7b3 Merge "Correct documentation for update()" am: 25e701b915
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1717530

Change-Id: Ifbf5042ba811e6e8d740d934d9a630b3e17c7008
2021-05-26 12:38:19 +00:00
Treehugger Robot
25e701b915 Merge "Correct documentation for update()" 2021-05-26 12:16:04 +00:00
Jack Yu
582d364663 Merge "Skip tests for single SIM devices" am: cf76f68c92
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1711732

Change-Id: I68b539d54d5e8b63776b3d4f126ae06869fbc528
2021-05-25 22:22:20 +00:00
Jack Yu
cf76f68c92 Merge "Skip tests for single SIM devices" 2021-05-25 22:03:35 +00:00
Treehugger Robot
8d360f3259 Merge "Generate COSE MAC with a callback, not raw key" am: 29159c728f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1691072

Change-Id: I910bbe0eed7ba0fc42671081e7c6ea5f2263a27b
2021-05-25 19:53:35 +00:00
Treehugger Robot
29159c728f Merge "Generate COSE MAC with a callback, not raw key" 2021-05-25 19:35:37 +00:00
Chirag Pathak
8ac0743508 Fix for the documentation in TimeStampToken.aidl. HMAC computation will always use 1, which is the value of SecurityLevel.TRUSTED_ENVIRONMENT. This is done for backwards compatibility purpose.
Test: N/A
Bug: None.

Change-Id: I1fd979908103f9095cc7c306e0d5036d6b357b30
2021-05-25 19:22:43 +00:00
Treehugger Robot
939cb09234 Merge "Shifting VTS libs to static_lib entry" am: 241327c140
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1716488

Change-Id: Id514744c35a16c4268fb9073a47bf5253ab171fb
2021-05-25 18:26:43 +00:00
Treehugger Robot
241327c140 Merge "Shifting VTS libs to static_lib entry" 2021-05-25 18:12:22 +00:00
Seth Moore
026bb7431d Generate COSE MAC with a callback, not raw key
The cppcose_rkp library was updated to generate MAC via callback instead
of passing keys around to allow for stronger MAC key protection.

Bug: 182928606
Test: VtsHalRemotelyProvisionedComponentTargetTest
Test: RemoteProvisionerUnitTests
Change-Id: Ia8a0410408fe3064e904c5282b52f172f8134b9a
Merged-In: Ia8a0410408fe3064e904c5282b52f172f8134b9a
2021-05-25 07:57:13 -07:00
Shawn Willden
0b11d84fdd Correct documentation for update()
update() is no longer allowed to consume only part of the data provided.

Change-Id: Ia64a9c0340f19b5dca6dff2502dc7072021522b6
Test: N/A
2021-05-25 12:14:03 +00:00
David Drysdale
300b555b6b KeyMint VTS: test getKeyCharacteristics()
Bug: 186685601
Bug: 188855306
Test: VtsAidlKeyMintTargetTest
Change-Id: Icf400533b0ded98b9338f2d782d95d90c7efbff4
2021-05-25 11:07:51 +01:00
Jooyung Han
e18782cd83 Merge "android.hardware.common.fmq: update AIDL dump" am: 4477ee052f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1713777

Change-Id: I4d8e2258c194493c509de22dc1e90297935e5e50
2021-05-25 01:04:17 +00:00
Jooyung Han
4477ee052f Merge "android.hardware.common.fmq: update AIDL dump" 2021-05-25 00:45:22 +00:00
Max Bires
e857afb6a6 Shifting VTS libs to static_lib entry
If these HALs aren't present on the device, then the test runner will
fail due to test binary trying to dynamically link to libs that aren't
present. Statically linking them will allow the test to fail gracefully
when the test harness sees that the HAL interfaces aren't available on
device.

Fixes: 184797684
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I0f8dea081a51256cfb0e50d6af20038e2b8f1f07
Merged-In: I0f8dea081a51256cfb0e50d6af20038e2b8f1f07
2021-05-23 22:10:13 +00:00
Jooyung Han
64512ccf27 android.hardware.common.fmq: update AIDL dump
Bug: n/a
Test: m (runs checkapi)
Change-Id: I2c58ee3857525497e4693509674dd023d05739d9
2021-05-23 07:45:54 +09:00
Steven Moreland
feccaa3297 Merge "Fix 'kernel_config' error." am: e19ee04dd6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1714398

Change-Id: I83c208ddf6fe8c93b8cca887113d7f5d0630d4ba
2021-05-21 23:40:09 +00:00
Steven Moreland
e19ee04dd6 Merge "Fix 'kernel_config' error." 2021-05-21 23:23:47 +00:00
Steven Moreland
7c26b15e75 freeze compat matrix 6 for Android S am: be6a797247
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1714397

Change-Id: If0e7be8ba29e24d835f7e5df21bf81f7d48fea10
2021-05-21 23:11:32 +00:00
Steven Moreland
3f40b2b624 Fix 'kernel_config' error.
The error is on property kernel_configs, but it is described as being on
kernel_config.

Bug: N/A
Test: N/A
Change-Id: Ifa58ac370775d5b5d01860be446bc961f52f667f
2021-05-21 20:28:03 +00:00
Steven Moreland
be6a797247 freeze compat matrix 6 for Android S
The current matrix is left in this same CL because this way, downstream
modifications to the current CL will automatically get absorbed into the
level 7 compatibility matrix. A CL on top of this will disable the 7
matrix and then get reverted in the aosp/master..goog/master merge
path.

WARNING: this is not actually the Android S compatibility matrix in this
CL, but rather the AOSP current matrix copied into
compatibility_matrix.6.xml. The actual S compatibility matrix is not
released on AOSP yet. However, this is the parts of it which are
available on AOSP, added here in order to allow Android T development
in a way that will merge happily downstream.

Bug: 178221726
Test: boot device, vts_treble_vintf_vendor_test
Test: inspect matrix by diffing matrix with old matrix using:
    m analyze_matrix &&
    system/libvintf/analyze_matrix/hals_for_release.py
Change-Id: Id83986fc5089eefc2292f0042753f739f4e01a44
(cherry picked from commit 86a518cfa6)
Merged-In: Id83986fc5089eefc2292f0042753f739f4e01a44
2021-05-21 19:14:28 +00:00
Treehugger Robot
23cf42c88d Merge "KeyMint: improve HAL spec and tests" am: 4757105f06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1711128

Change-Id: I72fffc42d3570d932a69af2eed84403a615b52db
2021-05-21 06:34:38 +00:00
Treehugger Robot
4757105f06 Merge "KeyMint: improve HAL spec and tests" 2021-05-21 06:24:08 +00:00
David Drysdale
db0dcf5034 KeyMint: improve HAL spec and tests
- clarify & test BIGNUM spec
- allow alternative return codes when requesting device unique
  attestation
- use specific error for early boot import failure
- test more early boot key scenarios (in post-early-boot mode)

Test: VtsAidlKeyMintTargetTest
Change-Id: I70a342084a29144aef1ed0ff80fec02cc06ffbc0
2021-05-19 16:40:25 +01:00
Jack Yu
643cb39721 Merge "Fixed the obsolete VTS owners" am: 83d85178f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1711731

Change-Id: I32c182a5f2debb9dbc2d0a008c8469f705bea63f
2021-05-19 07:22:29 +00:00
Jack Yu
83d85178f1 Merge "Fixed the obsolete VTS owners" 2021-05-19 07:07:07 +00:00
Aaron Tsai
db8b5cedf6 Fix emergencyDial tests in VTS 1.6 am: cbfd8e2d10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1708089

Change-Id: I2b4cfdacc0f2a018873496b58d3bd45df48dfd4f
2021-05-19 03:10:52 +00:00
Jack Yu
ef0d87afcb Skip tests for single SIM devices
When device is configured as single SIM device, skip
VTS on 2nd vendor radio service instance.

Fix: 187998097
Test: atest VtsHalRadioV1_6TargetTest
Merged-In: Ib634b22dd75f10e5059c9482764ca481184162be
Change-Id: Ib634b22dd75f10e5059c9482764ca481184162be
(cherry picked from commit efb934b15a)
2021-05-18 18:10:32 -07:00
Jack Yu
36b3af727d Fixed the obsolete VTS owners
Fix: 188209583
Test: None
Merged-In: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
Change-Id: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
(cherry picked from commit 879b3c0809)
2021-05-18 18:09:59 -07:00
Aaron Tsai
cbfd8e2d10 Fix emergencyDial tests in VTS 1.6
- Change to calling getVoiceRegistrationState_1_6() instead of getVoiceRegistrationState().
 - Fix incorrect voice registration state value

Bug: 187488263
Test: atest VtsHalRadioV1_6TargetTest
Change-Id: Iba5dcef20683bc6dca00b1c49899cfec5e1aac03
2021-05-19 00:40:14 +00:00
David Drysdale
151917bb54 Merge changes I10c4beea,I0efc30f3 am: cad5403270
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705261

Change-Id: Ia8bfbf703e25572678fba6a92f42e018ffb5ace4
2021-05-17 19:56:11 +00:00
David Drysdale
cad5403270 Merge changes I10c4beea,I0efc30f3
* changes:
  KeyMint VTS: local RSA encryption
  KeyMint VTS: local asymmetric verification
2021-05-17 17:12:40 +00:00
David Drysdale
8c00b2bc53 Merge "KeyMint HAL: cert dates are in milliseconds" am: 8d1d302ffa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1697336

Change-Id: I4577693fc899387b615e0f89be171c5457b39d46
2021-05-17 14:05:28 +00:00
David Drysdale
8d1d302ffa Merge "KeyMint HAL: cert dates are in milliseconds" 2021-05-17 13:45:21 +00:00
Tommy Chiu
e56e43ed89 Merge "KeyMint vts: Correct the EC curve parameter and some return code" am: 77aae9e40e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1703027

Change-Id: I968a78699c38e4a8e50dc6cde80021fecbe48e8d
2021-05-15 02:19:12 +00:00
Tommy Chiu
77aae9e40e Merge "KeyMint vts: Correct the EC curve parameter and some return code" 2021-05-15 01:50:30 +00:00
Treehugger Robot
9f4239423d Merge "KeyMint VTS: fix 3DES key sizes" am: 4862e3f6f3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699808

Change-Id: I4d5ab048ce1cf7852bc66e4410694d9c0e1255ea
2021-05-14 22:14:06 +00:00
Treehugger Robot
4862e3f6f3 Merge "KeyMint VTS: fix 3DES key sizes" 2021-05-14 21:55:00 +00:00
Treehugger Robot
6ece4c1da3 Merge changes Id027b742,I486ccad8 am: 44c294e621
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705136

Change-Id: Iaf5b44fc72dd3ad259d22ed04cf20f215f9136c2
2021-05-14 21:18:35 +00:00
Gareth Fenn
86d8d2caf2 Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705148

Change-Id: Ia337384e925b7d7109a7985c5e2a582c3b97461d
2021-05-14 21:17:47 +00:00
Treehugger Robot
44c294e621 Merge changes Id027b742,I486ccad8
* changes:
  Add additional DVBT settings example usage to sample_tuner_vts_config.xml
  Add additional DVBT settings to TunerTestingConfig
2021-05-14 20:59:39 +00:00
Gareth Fenn
b9722f1236 Add additional DVBT settings example usage to sample_tuner_vts_config.xml
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: Id027b74267e97822f76607545bf23174a623e74e
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 18:23:21 +00:00
Gareth Fenn
8fa4cff4ce Add additional DVBT settings to TunerTestingConfig
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: I486ccad855662e6b9fa7cd1be3eb3949356d6a1f
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
2021-05-14 16:34:36 +00:00
Treehugger Robot
898f676017 Merge "Adding 1s time gap between slot1 & slot2 setDataThrottling tests" am: 9f7a1e8317
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705149

Change-Id: I8906af50a9ae7f8f058bed623335806ce0ddf6e0
2021-05-14 06:25:13 +00:00