GitLab

SoftKeymasteDevice can provide software digesting and padding for
keymaster1 implementations that don't provide all of the required
digests.  This CL modifies keymaster to check for such keymaster1
implementations and add a SoftKeymasterDevice wrapper.

The SoftKeymasterDevice work necessary to make this function would have
required adding an implementation of the keymaster0 API import_keypair
in terms of keymaster1 API calls (import_key).  Rather than do that, I
instead implemented the relevant keystore function directly on the
keymaster1 API.  This approach is cleaner than adding the same code into
the translation layer, and allows removal of the last vestiges of
keymaster0 API usage from keystore.

Bug: 24873723
Change-Id: Ie4c7bba7943a549f35df3086dccea001edb5bb2b

When debugging SE Linux rules, the pid and uid of the source context are
helpful in determining what was involved in generating the policy violation.
This information was absent from the keystore logs.

To remedy this, we add pid and uid to the logs:

avc:  denied  { exist } for pid=571 uid=1000 ...

Change-Id: Ic22128720aa8ac225f26896f9e710783c8ab4f70
Signed-off-by: William Roberts <william.c.roberts@intel.com>

* commit 'db441ea6':
  Prepare for BoringSSL update.

This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.

Change-Id: I3d09b5644661353723803bcbda937d34455849a5

* commit 'aae1bbf4':
  bundle init.rc contents with its service

Bug: 23186545
Change-Id: If471bcc8333d546cde055bbcfc541a26fc21d90f

* commit '2ac5cb65':
  Fix pessimizing move.

The std::move() here is unnecessary, and prohibits the compiler from
performing copy elision.

Change-Id: Ibdf515c4c0b0c07ff966c696e671a0526be1528e

Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I21ad9dfec4fe36dd935403c9fd0af5e20e131036
(cherry picked from commit 17ee05c5)

am cbfdeefe: am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit 'cbfdeefe':
  Properly check for Blob max length

am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '8a2c33b6':
  Properly check for Blob max length

* commit '48d998cd':
  Properly check for Blob max length

* commit 'aca71139':
  Properly check for Blob max length

* commit '738d1e9d':
  Properly check for Blob max length

* commit '1b8885ba':
  Properly check for Blob max length

* commit '0d593526':
  Properly check for Blob max length

* commit '54b1e9ad':
  Properly check for Blob max length

sizeof(mBlob.value) is incorrect because writeBlob pads up to the next
AES_BLOCK_SIZE

Bug:22802399
Change-Id: I377edca2c7ea2cf4455f22f5f927fdad79893729

sizeof(mBlob.value) is incorrect because writeBlob pads up to the next
AES_BLOCK_SIZE

Bug:22802399
Change-Id: I377edca2c7ea2cf4455f22f5f927fdad79893729

am 4174f017: am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '4174f017':
  Fix unchecked length in Blob creation

am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit 'c761a1ed':
  Fix unchecked length in Blob creation

am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creation

* commit '63bc525c':
  Fix unchecked length in Blob creation

* commit '853b8d79':
  Fix unchecked length in Blob creation

* commit 'fd1ad379':
  Fix unchecked length in Blob creation

* commit '1c73457a':
  Fix unchecked length in Blob creation

* commit 'b124c9e8':
  Fix unchecked length in Blob creation

* commit '803f37f5':
  Fix unchecked length in Blob creation

Applications can specify arbitrary blobs using insert(), check their
length to prevent overflow issues.

Bug:22802399
Change-Id: I4097bd891c733914df70da5e2c58783081d913bf

Applications can specify arbitrary blobs using insert(), check their
length to prevent overflow issues.

Bug:22802399
Change-Id: I4097bd891c733914df70da5e2c58783081d913bf

* commit '2de8b758':
  Add all digests and padding modes to legacy keys

Bug: 22556114
Change-Id: I44fda03305ddd50cb4ba3c6f6b24cfd9c2af9659

* commit 'a9a17eec':
  Mark 0 length files as corrupt

Files created by keystore should never be 0 length however a vendor ran
into such a case when testing their keymaster and a side effect of how
keystore parses files leads to these keys being considered encrypted and
ulitmately undeletable.

Now mark 0 length files as corrupt in readKey and when deleting a key if
the key fails to read in because it was corrupt simply rm the file since
it is not possible to feed the key blob to keymaster's delete method.

Bug: 22561219
Change-Id: Ie8c1ffe97d1d89c202cdab7a6b4b5efc914cbbff

* commit '06114e6a':
  Fix erroneous reporting of all tokens as timed out.

Bug: 22205545
Change-Id: I170e798b327020ff741031ec05e875c685a49e9d