Commit graph

1984 commits

Author SHA1 Message Date
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
Shawn Willden
e1afa5b8f3 Correct return type of delete_all_keys.
Change-Id: Ic868882a4b456913879f91562442ef233a58d09e
2015-04-10 07:50:36 -06:00
Shawn Willden
6950fae464 Merge "Simplify keymaster_key_origin_t." 2015-04-10 13:46:36 +00:00
Shawn Willden
8d6cf2594c Simplify keymaster_key_origin_t.
Change-Id: Iaba6156f238ea3bb1ad103b88ccea17344d296af
2015-04-10 07:28:25 -06:00
Shawn Willden
3f3b979073 Merge "Reduce the list of keymaster key formats to the required set." 2015-04-10 02:24:14 +00:00
Shawn Willden
def4b59e69 Merge "Reduce the list of keymaster padding modes to the required set." 2015-04-10 02:23:58 +00:00
Shawn Willden
fc691d9149 Merge "Reduce keymaster digest list to required set." 2015-04-10 02:23:38 +00:00
Shawn Willden
5e58787ba0 Merge "Reduce keymaster block modes to the required set." 2015-04-10 02:23:18 +00:00
Shawn Willden
1d9de3e6eb Merge "Reduce keymaster algorithm list to the required set." 2015-04-09 23:49:02 +00:00
Shawn Willden
5d8d398186 Merge "Start authenticator numbering from 1, instead of 2." 2015-04-09 23:21:23 +00:00
Shawn Willden
cd640d125f Reduce the list of keymaster key formats to the required set.
Change-Id: I3a0830ab2066d4c16c084d19040ec98e520896d4
2015-04-09 12:31:18 -06:00
Shawn Willden
8412fdc428 Reduce the list of keymaster padding modes to the required set.
Change-Id: If04ffc8e92678f57e2b730f77c0fab195e1096c4
2015-04-09 12:31:18 -06:00
Shawn Willden
fe6c4f0633 Reduce keymaster digest list to required set.
Change-Id: Id5c660feb7e71ea76473523e3a86e1ba01f19c82
2015-04-09 12:31:18 -06:00
Shawn Willden
c7deedad04 Reduce keymaster block modes to the required set.
Change-Id: I8f804978208e2c8701bd52dc79b5597a307b7e7a
2015-04-09 12:31:18 -06:00
Shawn Willden
e9797a740c Reduce keymaster algorithm list to the required set.
Change-Id: Ibffddc5c3a5c728182f5ca7f6a76381413fc8645
2015-04-09 12:31:09 -06:00
Shawn Willden
85cec0f1a3 Start authenticator numbering from 1, instead of 2.
Change-Id: I44d94fd597ae7dec5199388b9ab0bd952cf831c3
2015-04-06 11:53:22 -06:00
Shawn Willden
f1babb18ae Merge "Add KM_TAG_USER_SECURE_ID." 2015-03-21 03:13:34 +00:00
Shawn Willden
6a39dafe87 Merge "Use extern "C" rather than BEGIN/END_DECLS." 2015-03-19 01:26:28 +00:00
Shawn Willden
4719acae02 Add KM_TAG_USER_SECURE_ID.
This tag identifies the user authorized to use the key.  Unlike
KM_TAG_USER_ID, its value does not reference the Linux-side user ID, but
a secure-world user ID, generated and managed by secure-world
authentication apps.

Bug: 19511945
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
2015-03-18 19:25:07 -06:00
Shawn Willden
c51d01ed02 Use extern "C" rather than BEGIN/END_DECLS.
For compatibility with Trusty.  I'll probably revert this later after I
find a proper fix for Trusty.

Change-Id: I49b4ae55251398eec2a6633e09bbc468f16a4d14
2015-03-18 19:25:01 -06:00
Shawn Willden
201e5555b3 Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure." 2015-03-19 00:23:34 +00:00
Shawn Willden
c3ab05c3c4 Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
We may want to put the auth token structure elsewhere; it's consumed by
keymaster but produced by other components.

Bug: 19511945
Change-Id: Id9a22ad32137f3e0380c2812f790bbecab511d11
2015-03-18 17:40:34 -06:00
Shawn Willden
0eadc764d1 Merge "Add error codes." 2015-03-18 23:11:00 +00:00
Shawn Willden
ed94111cce Add error codes.
Change-Id: I78cac1887fd41dd426e7d125a5f9c54e73188983
2015-03-11 21:54:26 -06:00
Shawn Willden
37467e5b52 Merge "Add keymaster_key_param_compare function." 2015-03-12 00:39:25 +00:00
Shawn Willden
67411d6f51 Add keymaster_key_param_compare function.
This provides a reasonable ordering for params.

Change-Id: I1e3b403070d9e7621cc55c03ff9876ea3bbc699f
2015-03-04 10:04:35 -07:00
Shawn Willden
e05ffdbb30 am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
* commit '17dde875dda1b96722e6fb07850c268ca716c3d1':
  Separate keymaster0 and keymaster1 HALs.
2015-02-26 23:31:14 +00:00
Shawn Willden
17dde875dd Merge "Separate keymaster0 and keymaster1 HALs." 2015-02-26 23:24:42 +00:00
Dan Stoza
811445a3f3 HWC 1.5: Add per-layer damage region
This adds an array of rects to hwc_layer_1_t that define which
portions of that layer's source buffer have been modified. If there
are a non-zero number of rects, then any portion of the source buffer
not touched by one of the rects may safely be assumed to not have
been modified. If no rects are defined, then the whole source buffer
must be assumed to have been modified.

Change-Id: Id5efafee74602ed7d76609180e334ed203c23f7e
2015-02-25 13:42:18 -08:00
Shawn Willden
fd4b4d5a9b Separate keymaster0 and keymaster1 HALs.
For now the keymaster1 HAL still includes all of the keymaster0 entry
points, and soft_keymaster_device will continue to implement them.  In
the near future the keymaster0 entry points will be removed, as soon as
we can ensure that keystore no longer needs them.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-02-24 14:58:17 -07:00
Alex Klyubin
587d8313d6 am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
* commit '4f5949b5dda4a2e95d29e1aa3effb22c678df21a':
  Clarify the meaning of KM_TAG_MAC_LENGTH.
2015-02-24 00:49:44 +00:00
Alex Klyubin
4f5949b5dd Merge "Clarify the meaning of KM_TAG_MAC_LENGTH." 2015-02-24 00:43:51 +00:00
Alex Klyubin
340d0b12c5 Clarify the meaning of KM_TAG_MAC_LENGTH.
Change-Id: I18478923059783e955613142a8d3352f98f5d7b0
2015-02-20 16:42:23 -08:00
Bill Yi
fb9ad66afd Merge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEAD 2015-02-19 14:31:52 -08:00