diff options
| author | Shawn Willden <swillden@google.com> | 2016-03-09 19:41:29 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2016-03-09 19:42:59 -0700 |
| commit | e802a1e6cd0837fa9ba58a2a0b376a80ecdaec38 (patch) | |
| tree | a55bc639624ce9bc0dd9a78b2868ffb77dfe2ffe | |
| parent | 520256fba7b581b56a4a467b7fab9b936a8d5466 (diff) | |
| download | android_system_keymaster-e802a1e6cd0837fa9ba58a2a0b376a80ecdaec38.tar.gz android_system_keymaster-e802a1e6cd0837fa9ba58a2a0b376a80ecdaec38.tar.bz2 android_system_keymaster-e802a1e6cd0837fa9ba58a2a0b376a80ecdaec38.zip | |
Remove agree_key and add configure to keymaster2.
Key agreement (ECDH) has been punted from the N release, and a
configuration method has been added to support version binding.
Change-Id: Ie3219e9a5062c2f2bc4e298cd88af764f4c3809c
| -rw-r--r-- | soft_keymaster_device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp index 5b4e59f..5d646e2 100644 --- a/soft_keymaster_device.cpp +++ b/soft_keymaster_device.cpp @@ -275,12 +275,12 @@ void SoftKeymasterDevice::initialize_device_struct(uint32_t flags) { km2_device_.common.module = reinterpret_cast<hw_module_t*>(&soft_keymaster2_device_module); km2_device_.common.close = &close_device; + km2_device_.configure = nullptr; km2_device_.add_rng_entropy = add_rng_entropy; km2_device_.generate_key = generate_key; km2_device_.get_key_characteristics = get_key_characteristics; km2_device_.import_key = import_key; km2_device_.export_key = export_key; - km2_device_.agree_key = nullptr; // TODO(swillden) Implement ECDH km2_device_.attest_key = attest_key; km2_device_.upgrade_key = nullptr; // TODO(swillden) Implement upgrade km2_device_.delete_key = delete_key; |