Commit graph

1949 commits

Author SHA1 Message Date
Shawn Willden
6a39dafe87 Merge "Use extern "C" rather than BEGIN/END_DECLS." 2015-03-19 01:26:28 +00: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
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
Shawn Willden
f3391a9318 Merge changes I4ef53a09,I7c3c5bd5
* changes:
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.
2015-02-02 23:19:32 +00:00
Shawn Willden
e57b65c454 Remove get_output_size() method from keymaster HAL.
Rather than requiring implementations to be able to predict output
sizes, we'll just have the Java layer make a very conservative guess.

Change-Id: I4ef53a09d122d4ecf0c80b9dadc9c7a9073561cc
2015-02-02 11:52:36 -07:00
Shawn Willden
41e91e9fa3 Add tag to allow caller-specified nonce.
Change-Id: I7c3c5bd5f26a4d465554c998f673e0ee2ab8b86e
2015-02-02 11:52:14 -07:00
Haynes Mathew George
3ec7c973d1 am d5f7dbec: audio: Add audio parameter key for device connect
* commit 'd5f7dbec0cac2d0e638025e43f8fb0d611d22bfa':
  audio: Add audio parameter key for device connect
2015-02-02 15:29:58 +00:00
Elliott Hughes
cb37e73bb0 am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."
* commit 'ee84451582a1ccf3a177726f2848b64670c88437':
  Fix "error: 'strlen' was not declared in this scope".
2015-01-31 07:49:22 +00:00
Elliott Hughes
ee84451582 Merge "Fix "error: 'strlen' was not declared in this scope"." 2015-01-31 04:41:52 +00:00
Elliott Hughes
360956c4b0 Fix "error: 'strlen' was not declared in this scope".
Change-Id: I8ae39a6b3cf4844429e6211b3c909c6f72978832
2015-01-30 20:40:50 -08:00
Haynes Mathew George
d5f7dbec0c audio: Add audio parameter key for device connect
Add audio parameter key for device connect.

Bug: 17785277
Bug: 19214836
Change-Id: Icd81702634e0bd83645d89c2d65e2b303fc11f8c
(cherry picked from commit 55c07c3418a3bc19a72c4935d8ed57a57074c49a)
2015-01-31 01:42:31 +00:00
Elliott Hughes
06b402dd10 am ac41815a: Merge "Add missing includes."
* commit 'ac41815a99763b3e59d0f2f9ef2bb3e5a2011336':
  Add missing includes.
2015-01-30 21:16:31 +00:00
Lajos Molnar
811677e68d gralloc: clarify lock_ycbcr in light of multimedia codec usage
Bug: 19179927
Change-Id: I53886f8d1a3a998b958f031b04ddd4cbf19aad2c
2015-01-30 11:02:58 -08:00
Elliott Hughes
ac41815a99 Merge "Add missing includes." 2015-01-30 06:25:47 +00:00
Elliott Hughes
07c085565a Add missing includes.
Change-Id: I91730363386dae6ecb2193ec8f50ba9f8fc0ad60
2015-01-29 21:19:10 -08:00
Zhijun He
2a96edc36a am b2bc0e51: camera3: update ZSL spec
* commit 'b2bc0e518278b228d8b4c6bd324f04237feb92c3':
  camera3: update ZSL spec
2015-01-29 23:49:04 +00:00
Zhijun He
b2bc0e5182 camera3: update ZSL spec
INPUT stream is not used by framework-implemented ZSL (HAL3.2), the sample
use case description is incorrect.

Bug: 19197776
Change-Id: I247ad8755b2197c2a62cc109c151749b42a4bd49
2015-01-29 14:44:37 -08:00
Elliott Hughes
588f725985 am f4530d6e: Merge "Add missing includes."
* commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6':
  Add missing includes.
2015-01-29 05:21:41 +00:00
Elliott Hughes
f4530d6eed Merge "Add missing includes." 2015-01-29 04:59:25 +00:00
Elliott Hughes
84b9ff8b1c Add missing includes.
Change-Id: Ia74cceea707e51195a570eed37d4b334ac413773
2015-01-28 19:54:13 -08:00
Shawn Willden
fb823c7f6e am 1e541c22: Merge changes I85f430fb,I514a136b
* commit '1e541c22d3552b116f0ab3e3a826f458b2821673':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
2015-01-29 01:00:58 +00:00