commit f4530d6eed5fa432fe9283355a265a38aea58bc6
author Elliott Hughes <enh@google.com> Thu Jan 29 04:59:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 29 04:59:25 2015 +0000
tree 5afb43d69b0fb1133ac6ab8df68423eb3253da18
parent 1e541c22d3552b116f0ab3e3a826f458b2821673
parent 84b9ff8b1c1e58c735d1296380c36227ca825ea1

Merge "Add missing includes."

include/hardware/keymaster.h

diff --git a/include/hardware/keymaster.h b/include/hardware/keymaster.h
index a6200a5..2c6e29d 100644
--- a/include/hardware/keymaster.h
+++ b/include/hardware/keymaster.h
@@ -278,7 +278,7 @@
      *
      * \param[in] data_length Length of \p data.
      */
-    keymaster_error_t (*add_rng_entropy)(const struct keymaster_device* dev, uint8_t* data,
+    keymaster_error_t (*add_rng_entropy)(const struct keymaster_device* dev, const uint8_t* data,
                                          size_t data_length);
 
     /**
@@ -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,