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
Shawn Willden
0e5fca1ca4
Merge changes Id4bdfdcb,Ib94f3606
...
* changes:
Added insecure (chunkless) AEAD option.
Add additional param lists to update and finish.
2015-02-18 15:48:03 +00:00
Shawn Willden
892ae44c5f
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
2015-02-18 05:50:07 +00:00
Shawn Willden
d7cc04b275
am 6bdaf827
: Merge "Add explicit values to keymaster_key_format_t"
...
* commit '6bdaf827ef59975efbf73b2d5b4228fb61c36123':
Add explicit values to keymaster_key_format_t
2015-02-14 00:53:14 +00:00
Shawn Willden
6bdaf827ef
Merge "Add explicit values to keymaster_key_format_t"
2015-02-14 00:40:42 +00:00
Chad Brubaker
f883b988e7
Add explicit values to keymaster_key_format_t
...
Change-Id: I4113286396b16ca687fbd8bc38b2f16063fc1024
2015-02-13 13:58:36 -08:00
Nick Vaccaro
4c2059d8fb
am adbfbb74
: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
...
* commit 'adbfbb747de9fe1efc21fc83f6591e7d13c81c36':
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
2015-02-11 00:20:54 +00:00
Shawn Willden
79d7934684
Added insecure (chunkless) AEAD option.
...
Also moved chunk length specification to operation parameter rather than
keygen parameter.
Change-Id: Id4bdfdcb1c7b64b3f22b4027e037e37c2860ec39
2015-02-10 15:15:47 -07:00
Shawn Willden
67ba9e8144
Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
...
Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669
2015-02-09 16:02:51 -07:00
Shawn Willden
e26e136c4f
Add additional param lists to update and finish.
...
At the moment this is to accommodate associated data for AEAD modes, but
there may be other parameters in the future.
Change-Id: Ib94f3606e3f714f6fa75bf0d4bd75804d9a8db4e
2015-02-09 16:02:51 -07:00
Nick Vaccaro
adbfbb747d
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
...
Adds a new sensor type for converting the Android Wear defined wrist
tilt sensor type into an official android sensor type.
Change-Id: If6357aeb463a556a68a19b28931edec04f99a952
2015-02-05 12:26:35 -08:00
Lajos Molnar
2c16d1e07d
am a163e491
: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
...
* commit 'a163e491c148468884520d6d331a0f6d19104677':
gralloc: clarify lock_ycbcr in light of multimedia codec usage
2015-02-04 15:49:31 +00:00
Lajos Molnar
a163e491c1
Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
2015-02-04 07:18:04 +00:00
Shawn Willden
efbc9f6d0b
am 949d6d4b
: Merge changes I38700cda,I088e6094
...
* commit '949d6d4bfc1cf37a84d5d4ac00a20017941fdeba':
Add raw key format, for symmetric key import.
Remove "required" label from DSA algorithm.
2015-02-03 20:41:29 +00:00
Shawn Willden
949d6d4bfc
Merge changes I38700cda,I088e6094
...
* changes:
Add raw key format, for symmetric key import.
Remove "required" label from DSA algorithm.
2015-02-03 20:30:05 +00:00
Shawn Willden
e1b7636ca1
Add raw key format, for symmetric key import.
...
Change-Id: I38700cdafcf1f244584d6e88f8d9540c70a7de56
2015-02-03 11:12:20 -07:00
Shawn Willden
f7745ac27e
Remove "required" label from DSA algorithm.
...
Change-Id: I088e6094ec56f434356d11ab2032b1a5b1223334
2015-02-03 11:10:48 -07:00
Shawn Willden
9da1cb51c6
am f3391a93
: Merge changes I4ef53a09,I7c3c5bd5
...
* commit 'f3391a93188de86f7e15859e613faba94f65cdbc':
Remove get_output_size() method from keymaster HAL.
Add tag to allow caller-specified nonce.
2015-02-02 23:39:20 +00:00