tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 1e541c22: Merge changes I85f430fb,I514a136b

Browse source 
* commit '1e541c22d3552b116f0ab3e3a826f458b2821673':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.
This commit is contained in:
Shawn Willden 2015-01-29 01:00:58 +00:00 committed by Android Git Automerger
commit fb823c7f6e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/hardware/keymaster.h
View file

@ -401,7 +401,7 @@ struct keymaster_device {
const keymaster_key_blob_t* key_blob,
const keymaster_blob_t* client_id,
const keymaster_blob_t* app_data,
const keymaster_key_blob_t* rescoped_key_blob,
keymaster_key_blob_t* rescoped_key_blob,
keymaster_key_characteristics_t** characteristics);
/**

2
include/hardware/keymaster_defs.h
View file

@ -378,7 +378,7 @@ typedef enum {
KM_ERROR_UNSUPPORTED_KEY_SIZE = -6,
KM_ERROR_UNSUPPORTED_BLOCK_MODE = -7,
KM_ERROR_INCOMPATIBLE_BLOCK_MODE = -8,
KM_ERROR_UNSUPPORTED_TAG_LENGTH = -9,
KM_ERROR_UNSUPPORTED_MAC_LENGTH = -9,
KM_ERROR_UNSUPPORTED_PADDING_MODE = -10,
KM_ERROR_INCOMPATIBLE_PADDING_MODE = -11,
KM_ERROR_UNSUPPORTED_DIGEST = -12,