Commit graph

2017 commits

Author SHA1 Message Date
Shawn Willden
f6e1ec3a47 Rename keymaster tag types to clarify that integers are unsigned.
Bug: 22008538
Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
2015-06-24 22:31:51 -06:00
Shawn Willden
c24b5621c4 Merge changes I2e5515ef,I3b807e3e
* changes:
  Add new error codes for rate-limit and max-use failures.
  Update comments on now-unsed user ID and app ID tags.
2015-06-25 03:34:22 +00:00
Shawn Willden
3058325de9 Merge "Remove KM_TAG_AEAD_TAG." 2015-06-25 03:31:08 +00:00
Shawn Willden
9b9376ef54 Add new error codes for rate-limit and max-use failures.
Bug: 21607106
Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
2015-06-24 21:29:25 -06:00
Shawn Willden
e1bce9625e Update comments on now-unsed user ID and app ID tags.
I'd just remove them but Trusty keymaster has been generating keys with
KM_TAG_ALL_USERS and KM_TAG_ALL_APPLICATIONS, so removing them without
breaking those keys is tricky.  Plus I think they may come back.

Bug: 21845167
Change-Id: I3b807e3e4bee64eba72b7fa6f1ee1929c4ca9dd0
2015-06-24 21:29:07 -06:00
Shawn Willden
b1d948edec Remove KM_TAG_AEAD_TAG.
Bug: 19919114
Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
2015-06-24 21:21:54 -06:00
Shawn Willden
b138a64cba Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" 2015-06-12 19:28:31 +00:00
Shawn Willden
c590cf313c Merge "Add output params to update() and finish()." 2015-06-12 19:26:28 +00:00
Shawn Willden
ed5a71fe7a Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" 2015-06-12 19:25:21 +00:00
Dan Albert
5e901ed49f Merge "Use abort() instead of a null dereference." 2015-06-11 19:41:44 +00:00
Dan Albert
5b57857c7f Use abort() instead of a null dereference.
Clang deletes these because they're invalid. It's pretty awful of
clang to do this, but this should be abort() anyway.

Change-Id: I89423ff2c4d08db82077e56b726549e3783d38e1
2015-06-11 11:04:52 -07:00
Shawn Willden
a39ce12db8 Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug: 19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
2015-06-11 09:10:50 -06:00
Shawn Willden
75a885f500 Add output params to update() and finish().
Also, change signatures of several methods to pass structs rather than
array pointers and lengths.

Change-Id: Iaa1be186ebbd444202c47926ab57ac65d57416d7
2015-06-11 09:10:40 -06:00
Shawn Willden
b50083e235 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-11 09:10:32 -06:00
Andre Eisenbach
5dc18299df Merge "LE low power scan feature" 2015-06-10 20:46:59 +00:00
Satya Calloji
47565882c7 LE low power scan feature
LE low power extended scan feature header changes
based on Google spec v0.95

Bug: 20029342
Change-Id: Id1020a4da177d0bc421fdd123c5355a291cc0475
2015-06-10 20:46:51 +00:00
Andre Eisenbach
c93526225f Merge "Bluetooth native dumpsys logging support (1/5)" 2015-06-10 20:19:25 +00:00
Andre Eisenbach
9a83650cef Bluetooth native dumpsys logging support (1/5)
Bug: 18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
2015-06-08 00:07:51 -07:00
Dan Stoza
5e6082fd56 Merge "gralloc: Sort usage flags" 2015-06-03 18:17:47 +00:00
Dan Stoza
f456512f9e Merge "libhardware: fix gralloc usage bit redefine" 2015-06-03 18:17:16 +00:00
Dan Stoza
9181f6da9e gralloc: Sort usage flags
Sorts the usage flags in increasing order so it's easier to see where
the gaps are.

Bug: 21609491
Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03
(cherry picked from commit fd2d859445)
2015-06-03 11:03:26 -07:00
Chong Zhang
07cc032570 libhardware: fix gralloc usage bit redefine
bug: 21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
(cherry picked from commit 2e3ed7e2e7)
2015-06-03 11:02:59 -07:00
Dan Stoza
8a9ae4bd71 Merge "gralloc: Add foreign buffer usage flag" 2015-06-01 18:21:17 +00:00
Dan Stoza
44ddf4208a gralloc: Add foreign buffer usage flag
Adds GRALLOC_USAGE_FOREIGN_BUFFERS, which a consumer may set as a usage
flag if it intends to attach buffers that it has not detached from the
BufferQueue. It provides a hint to the producer (who may query the
consumer usage bits) that it may receive a buffer from another
BufferQueue, so that it can exit during initialization, hopefully with a
meaningful error message, if such buffers are not supported.

Also adds GRALLOC_USAGE_ALLOC_MASK, which is applied to usage bits
before calling alloc on the gralloc module, and prevents the module from
seeing GRALLOC_USAGE_FOREIGN_BUFFERS, since that usage flag is of no use
while allocating buffers.

Bug: 19801661
Change-Id: I17b927de94245f4df7cfd3f4483b544da3e9cd35
(cherry picked from commit 201c7d91b7)
2015-06-01 11:19:30 -07:00
Andres Morales
d39ab59be0 Merge "add request re-enroll to HAL API" 2015-05-27 01:37:10 +00:00
Andres Morales
c65adc73e3 add request re-enroll to HAL API
devices may want to request an upgrade to a newer pasword
handle version

Change-Id: I34c731c81406e29961cff1fcccdefad02cff1237
2015-05-27 01:35:20 +00:00
Andres Morales
09bd94db85 Merge "[gatekeeper] document timeout requirements" 2015-05-19 18:27:45 +00:00
Andres Morales
624ae04e60 [gatekeeper] document timeout requirements
GateKeeper may throttle the user, document the return
value of calls in this case.

No code changes.

Bug:21118563
Change-Id: Idd6c392d01c22627f828d86dd219a4a1d6e81439
2015-05-19 18:15:37 +00:00
Shawn Willden
ee50eb6603 Merge "Add KM_TAG_BOOTLOADER_ONLY." 2015-05-12 12:11:36 +00:00
Shawn Willden
57c93875e8 Add KM_TAG_BOOTLOADER_ONLY.
Change-Id: Ia507a1378487640683985dbce2e76679261900d3
2015-05-12 11:46:02 +00:00
Shawn Willden
44de9badfa Merge "Remove rescoping." 2015-05-12 11:38:37 +00:00
Shawn Willden
35ee53cc5c Remove rescoping.
Rescoping was never a very good solution to the problem of supporting
multiple sets of authorizations for a given key material.  For M we're
removing it and in the future a better solution will be provided.

Change-Id: I6f7585274487bd66e4d90e89014af41e9aa30411
2015-05-11 07:06:01 -06:00
Shawn Willden
881618305c Merge "Add KM_ERROR_CALLER_NONCE_PROHIBITED error code." 2015-04-29 04:26:08 +00:00
Shawn Willden
ca26b0056c Add KM_ERROR_CALLER_NONCE_PROHIBITED error code.
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
2015-04-28 00:00:27 -06:00
Andres Morales
a84659da8d Merge "Add gatekeeper HAL" 2015-04-27 17:02:01 +00:00
Andres Morales
ec833bf3e4 Add gatekeeper HAL 2015-04-27 17:00:17 +00:00
Ed Heyl
35550a1030 Merge changes from topic 'system-bt'
* changes:
  L2CAP and SDP Search API for BT profiles (1/2)
  Incorrect RSSI value in onlost/onfound
  OnFound/OnLost feature API changes based on spec v0.90
2015-04-25 23:26:54 +00:00
kschulz
43d3443ce2 L2CAP and SDP Search API for BT profiles (1/2)
Added interface to create SDP records, to allow the upper
layers to set the content of the SDP record, including
both a RCFOMM channel and a l2cap PSM.

Change-Id: I7c47848a10b3d3091afbeadb4de8a8d7ea812288
2015-04-23 12:42:32 -07:00
Satya Calloji
807a994719 Incorrect RSSI value in onlost/onfound
Fix for signed value in onlost/onfound

Bug: 19891550
Change-Id: Idee4c566fe0d6f10a87c92f5bf03743fddbe2261
2015-04-23 12:42:32 -07:00
Satya Calloji
41121c80c5 OnFound/OnLost feature API changes based on spec v0.90
Bug: 19609671
Change-Id: Id28e188159aa41c940723fb5b12cade0a48e506b
2015-04-23 12:42:32 -07:00
Dan Stoza
8fcb7ee243 Merge "HWC 1.5: Add per-layer damage region" 2015-04-15 20:35:49 +00:00
Shawn Willden
4827279cec Merge "Add KM_ORIGIN_UNKNOWN." 2015-04-14 17:43:00 +00:00
Shawn Willden
d359b04483 Add KM_ORIGIN_UNKNOWN.
This designates keys whose origin cannot be determined because the
keymaster implementation is old and did not record it.

Change-Id: I3c366d527ed211c59f6dc04ddb48f3e9b3a07c7d
2015-04-13 12:13:35 -06:00
Andres Morales
845ffceadc Merge "hw_auth_token: make timestamp 64 bits" 2015-04-13 17:58:13 +00:00
Andres Morales
606167c66b hw_auth_token: make timestamp 64 bits
Change-Id: I1f871300cd2edb407479e1e38284b068db364b38
2015-04-13 17:58:01 +00:00
Andres Morales
8632c99f9b Merge "Add HW_AUTH_TOKEN_VERSION constant" 2015-04-11 02:03:01 +00:00
Andres Morales
b9e58c810a Add HW_AUTH_TOKEN_VERSION constant
Change-Id: Ic01da2b9ed8efcdba7750d8ca7fe2321d9047b68
2015-04-11 02:02:53 +00:00
Shawn Willden
e7444884c7 Merge "Make several key crypto parameters repeatable." 2015-04-10 21:21:25 +00:00
Shawn Willden
614e69d4a2 Merge "Correct return type of delete_all_keys." 2015-04-10 20:12:47 +00:00
Shawn Willden
fe895d1bf7 Make several key crypto parameters repeatable.
Note that there's a pre-requisite to landing this CL: The Nexus 9
keystore.flounder.so must be modified to translate between new and old
tag numbers when the TEE side is version 0.

Bug: 19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
2015-04-10 11:02:43 -06:00