commit 47bc0ffaddacc3514d12db1b8b8bb4b10eae13ea
author Shawn Willden <swillden@google.com> Thu Feb 26 23:31:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 26 23:31:10 2015 +0000
tree 1fd8b56aa58142916ae038c7549b57b3d6bb2314
parent aac44855caf0f2f7f2e655fc06ce9782b9c80af7
parent 5054f7ee4fa6e747eb8d08f60ec91ba6a9363878

am 5054f7ee: Merge "Rename keymaster_device_t to keymaster0_device_t."

* commit '5054f7ee4fa6e747eb8d08f60ec91ba6a9363878':
  Rename keymaster_device_t to keymaster0_device_t.

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 58bb066..af74d74 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -58,7 +58,7 @@
 #include "CheckBattery.h"
 #include "Process.h"
 
-#include <hardware/keymaster.h>
+#include <hardware/keymaster0.h>
 
 #define UNUSED __attribute__((unused))
 
@@ -98,7 +98,7 @@
 static int  master_key_saved = 0;
 static struct crypt_persist_data *persist_data = NULL;
 
-static int keymaster_init(keymaster_device_t **keymaster_dev)
+static int keymaster_init(keymaster0_device_t **keymaster_dev)
 {
     int rc;
 
@@ -109,7 +109,7 @@
         goto out;
     }
 
-    rc = keymaster_open(mod, keymaster_dev);
+    rc = keymaster0_open(mod, keymaster_dev);
     if (rc) {
         ALOGE("could not open keymaster device in %s (%s)",
             KEYSTORE_HARDWARE_MODULE_ID, strerror(-rc));
@@ -126,7 +126,7 @@
 /* Should we use keymaster? */
 static int keymaster_check_compatibility()
 {
-    keymaster_device_t *keymaster_dev = 0;
+    keymaster0_device_t *keymaster_dev = 0;
     int rc = 0;
 
     if (keymaster_init(&keymaster_dev)) {
@@ -149,7 +149,7 @@
     }
 
 out:
-    keymaster_close(keymaster_dev);
+    keymaster0_close(keymaster_dev);
     return rc;
 }
 
@@ -157,7 +157,7 @@
 static int keymaster_create_key(struct crypt_mnt_ftr *ftr)
 {
     uint8_t* key = 0;
-    keymaster_device_t *keymaster_dev = 0;
+    keymaster0_device_t *keymaster_dev = 0;
 
     if (keymaster_init(&keymaster_dev)) {
         SLOGE("Failed to init keymaster");
@@ -189,7 +189,7 @@
     ftr->keymaster_blob_size = key_size;
 
 out:
-    keymaster_close(keymaster_dev);
+    keymaster0_close(keymaster_dev);
     free(key);
     return rc;
 }
@@ -202,7 +202,7 @@
                                  size_t *signature_size)
 {
     int rc = 0;
-    keymaster_device_t *keymaster_dev = 0;
+    keymaster0_device_t *keymaster_dev = 0;
     if (keymaster_init(&keymaster_dev)) {
         SLOGE("Failed to init keymaster");
         return -1;
@@ -276,7 +276,7 @@
                                   signature,
                                   signature_size);
 
-    keymaster_close(keymaster_dev);
+    keymaster0_close(keymaster_dev);
     return rc;
 }