commit 957b1dc654cb785ade378c200a673654dd16ce61
author Janis Danisevskis <jdanis@google.com> Thu May 11 12:35:00 2017 -0700
committer Janis Danisevskis <jdanis@google.com> Tue Oct 03 16:13:21 2017 -0700
tree 37e057d2ca813edf8830fbdb2a69b7eb4f7054df
parent 7e03f98bd272b6e351852c52c981c1dae9ef00a9

Reflect: Removed KeymasterEnforcement dependencies on openssl

in system/keymaster.

Test: VtsHalKeymasterV3_0TargetTest

Bug: 67358942
Change-Id: Ie3e1fb94a299635e6c7cf45d78822b03bedf5d11

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index d83963f..8c905e9 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -23,6 +23,7 @@
 
 #include <hardware/keymaster_defs.h>
 #include <keymaster/keymaster_configuration.h>
+#include <keymaster/km_openssl/soft_keymaster_enforcement.h>
 #include <keymaster/soft_keymaster_device.h>
 
 namespace android {
@@ -33,9 +34,9 @@
 
 using ::keymaster::SoftKeymasterDevice;
 
-class SoftwareOnlyHidlKeymasterEnforcement : public ::keymaster::KeymasterEnforcement {
+class SoftwareOnlyHidlKeymasterEnforcement : public ::keymaster::SoftKeymasterEnforcement {
   public:
-    SoftwareOnlyHidlKeymasterEnforcement() : KeymasterEnforcement(64, 64) {}
+    SoftwareOnlyHidlKeymasterEnforcement() : SoftKeymasterEnforcement(64, 64) {}
 
     uint32_t get_current_time() const override {
         struct timespec tp;