commit 244cee7b1c72dcf6fc0fd2fc00e458fbd48e050b
author Shawn Willden <swillden@google.com> Thu Jan 29 17:21:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 29 17:21:35 2015 +0000
tree 71dbe324b0209ea945f0cc914f5f9f2651efd372
parent 5d773f3584a0c739d0873a1a3289b873faa85050
parent fb823c7f6e34973fbfbee788b2ed658dc4544742

am fb823c7f: am 1e541c22: Merge changes I85f430fb,I514a136b

* commit 'fb823c7f6e34973fbfbee788b2ed658dc4544742':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.

include/hardware/keymaster.h

diff --git a/include/hardware/keymaster.h b/include/hardware/keymaster.h
index 109ab38..2c6e29d 100644
--- a/include/hardware/keymaster.h
+++ b/include/hardware/keymaster.h
@@ -401,7 +401,7 @@
                                  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);
 
     /**

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index fb427a3..3f409b4 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -378,7 +378,7 @@
     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,