GitLab

The operation map caches the hw_auth_token used to start the operation
but it was storing the pointer returned by the auth token table and not
the token itself leading to a potential use-after-free if the token was
removed from the table between the operation starting and completeting.

The operation table now stores the auth token itself instead of the
pointer provided by the auth table.

Change-Id: I80fd49655ed98e7879d2caa7f1ae077ff50e0e54

Change-Id: Ib7f4996d2e2002db4892d5585761a053f6698495
(cherry picked from commit e1faa9fe)

Also, remove unneeded inclusion of key_blob.h.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa35fc

Remove old methods that were replaced by onUser* methods, rename methods
with unclear names, and add userId parameters to all operations that
operate with per user state.

(cherry-picked from commit 94436163)

Change-Id: I846fbb0a5ad17b4ee4c0c759fd1fd23f58b88d78

These will handle the logic of Android users being added/removed from
the device instead of the system calling the various reset/sync methods.

(cherry-picked from commit fd777e71)

Change-Id: Ic6be0de63cc1b0579a46e7101dcfeb1a9ffa4738

UserState related methods previously took uid's while the state was
based on userId, with the new keystore methods taking userIds start
moving everything in that direction.

(cherry-picked from commit 4efce0dc)

Change-Id: I075e973e2403575ba67e8e7a8c331a6c6f7e88e4

Replace password with notifyUserPasswordChanged for password changes,
unlock should now be used to unlock keystore instead of calling password
with the current password.

When the user removes their password now only keystore entries that were
created with FLAG_ENCRYPTED will be deleted. Unencrypted entries will
remain. This makes it more concrete that the keystore could be non-empty
while in STATE_UNINITIALIZED, though this was previously possible due to
the state only being checked if FLAG_ENCRYPTED was set.

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8

System should be able to call these methods with any targetUid.

(cherry picked from commit 01771ae9)

Bug: 20752184
Change-Id: Ieaeb2fa44b979970640abbd91c1d8a84f7c62b1f

Bug: 20717652
Change-Id: I2397e5cd906d45515a0b2a5591705f458c1aceb0
(cherry picked from commit 2764f867)

Also document that SoftKeymasterDevice should not be freed.

Change-Id: I027f137b0ffd474bb4b429691fe87eef6338b723
(cherry picked from commit 47a79ffa)

(cherry picked from commit 6b541163)

Bug: 20702036
Change-Id: I4caa9f7a6e6e2b05f63b12180a5af65d3a5c0bac

Auth tokens will now be checked on begin and then used for all
subsequent calls for that operation, this means that things like
auth timeouts will only be checked on begin, and operation that starts
at timeout - .00001 will now be able to be used to completion.

One exception to this is keys that use per operation authorization.
Begin for these operations must succeed so that the application gets a
handle to authorize. For those keys if the application calls update
before authorizing the operation the call will fail. For these keys
begin will return OP_AUTH_NEEDED so let the caller know more work is
needed before using the operation.

(cherry picked from commit aebbfc2b)

Change-Id: I3da4f93a076c0ed2d8630ca8cd1608e9bad2c2ff

* commit 'a680a0ca':
  keystore-engine: comment out unused args

* commit '57a72ec8':
  keystore-engine: comment out unused args

* commit '3ad91aa7':
  keystore-engine: comment out unused args

This fixes the build when -Werror -Wunused-parameter is enabled in the
compiler options.

Change-Id: I4581492c23885de8d31d2e66483ee281c0045c58

* commit '8e6b64cb':
  Add test for AuthTokenTable.Clear.

* commit 'ef76546c':
  Add test for AuthTokenTable.Clear.

* commit '28befb5e':
  Add test for AuthTokenTable.Clear.

Also fix tests broken by the change from 32 to 64-bit timestamps.

Change-Id: I5a80c6795880fe7231b1d311db7f3e0869913947

* commit 'c598fab3':
  Flush the auth token table on resetUid

* commit 'd914f657':
  Flush the auth token table on resetUid

* commit '7a4dd551':
  Flush the auth token table on resetUid

* commit 'b362ae3d':
  Support KM_LONG_REP

* commit 'bb9c9dbc':
  Support KM_LONG_REP

* commit '9484bb01':
  Support KM_LONG_REP

This prevents old stale auth tokens from sticking around after clearing.

Change-Id: I92e48b6d8cdba92cbc70f718cb45a4d96bd12900

Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0

* commit 'a1581c4e':
  Refactor permission and state checking

* commit '83ee2e7a':
  Refactor permission and state checking

* commit 'f1b8f6bf':
  Refactor permission and state checking

Move the permission checking code to checkBinderPermission and
checkBinderPermissionOrSelf target to simplify permission checking code
and clean up keystore methods. Also adds
checkBinderPermissionAndKeystoreState as a helper method to check the
permission and the unlock state of the keystore.

Change-Id: I77c94af1593d2a7fd100c79a6364583067ffa559

* commit '38beb106':
  Fix addAuthToken api

* commit 'a11517f6':
  Fix addAuthToken api