diff options
| author | Shawn Willden <swillden@google.com> | 2015-02-26 07:43:52 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-02-26 11:29:42 -0700 |
| commit | 48eb4e0b8a7e0e6ece7c3043219034e18ebada23 (patch) | |
| tree | 994afd0c313b0b6320d4f42a7762304b43c1257a | |
| parent | 6c0730fc1030bb41f8857ba5ff768dedb961dce0 (diff) | |
| download | exynos5-48eb4e0b8a7e0e6ece7c3043219034e18ebada23.tar.gz | |
Separate keymaster0 and keymaster1 HALs.
Change-Id: Ida47d6fae1ed7e85e7c223900f6b7a2e655fee47
(cherry picked from commit f02e17e73036be67a9c8d6ecc7b82cbc5684131d)
| -rw-r--r-- | libkeymaster/keymaster_mobicore.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libkeymaster/keymaster_mobicore.cpp b/libkeymaster/keymaster_mobicore.cpp index 7d11a18..9fa10aa 100644 --- a/libkeymaster/keymaster_mobicore.cpp +++ b/libkeymaster/keymaster_mobicore.cpp @@ -20,7 +20,7 @@ #include <stdint.h> #include <hardware/hardware.h> -#include <hardware/keymaster.h> +#include <hardware/keymaster0.h> #include <openssl/evp.h> #include <openssl/bio.h> @@ -66,7 +66,7 @@ struct RSA_Delete { }; typedef UniquePtr<RSA, RSA_Delete> Unique_RSA; -typedef UniquePtr<keymaster_device_t> Unique_keymaster_device_t; +typedef UniquePtr<keymaster0_device_t> Unique_keymaster_device_t; /** * Many OpenSSL APIs take ownership of an argument on success but don't free the argument @@ -92,7 +92,7 @@ static void logOpenSSLError(const char* location) { ERR_remove_state(0); } -static int exynos_km_generate_keypair(const keymaster_device_t* dev, +static int exynos_km_generate_keypair(const keymaster0_device_t* dev, const keymaster_keypair_t key_type, const void* key_params, uint8_t** keyBlob, size_t* keyBlobLength) { teeResult_t ret = TEE_ERR_NONE; @@ -133,7 +133,7 @@ static int exynos_km_generate_keypair(const keymaster_device_t* dev, return 0; } -static int exynos_km_import_keypair(const keymaster_device_t* dev, +static int exynos_km_import_keypair(const keymaster0_device_t* dev, const uint8_t* key, const size_t key_length, uint8_t** key_blob, size_t* key_blob_length) { uint8_t kbuf[RSA_KEY_BUFFER_SIZE]; @@ -229,7 +229,7 @@ static int exynos_km_import_keypair(const keymaster_device_t* dev, return 0; } -static int exynos_km_get_keypair_public(const struct keymaster_device* dev, +static int exynos_km_get_keypair_public(const keymaster0_device_t* dev, const uint8_t* key_blob, const size_t key_blob_length, uint8_t** x509_data, size_t* x509_data_length) { uint32_t bin_mod_len; @@ -328,7 +328,7 @@ static int exynos_km_get_keypair_public(const struct keymaster_device* dev, return 0; } -static int exynos_km_sign_data(const keymaster_device_t* dev, +static int exynos_km_sign_data(const keymaster0_device_t* dev, const void* params, const uint8_t* keyBlob, const size_t keyBlobLength, const uint8_t* data, const size_t dataLength, @@ -376,7 +376,7 @@ static int exynos_km_sign_data(const keymaster_device_t* dev, return 0; } -static int exynos_km_verify_data(const keymaster_device_t* dev, +static int exynos_km_verify_data(const keymaster0_device_t* dev, const void* params, const uint8_t* keyBlob, const size_t keyBlobLength, const uint8_t* signedData, const size_t signedDataLength, @@ -431,7 +431,7 @@ static int exynos_km_open(const hw_module_t* module, const char* name, if (strcmp(name, KEYSTORE_KEYMASTER) != 0) return -EINVAL; - Unique_keymaster_device_t dev(new keymaster_device_t); + Unique_keymaster_device_t dev(new keymaster0_device_t); if (dev.get() == NULL) return -ENOMEM; |