Merge changes I910e3d60,If1cdbe8e,I1d1b6983
* changes:
Rename keystore.{h|cpp} to KeyStore.{h|cpp}
Refactor OperationMap interface.
Small refactor to clarify auth token ownership.
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index 779437d..bb0356b 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -199,7 +199,7 @@
memset(&rsa_method_, 0, sizeof(rsa_method_));
rsa_method_.common.is_static = 1;
rsa_method_.private_transform = rsa_private_transform;
- rsa_method_.flags = RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE;
+ rsa_method_.flags = RSA_FLAG_OPAQUE;
ENGINE_set_RSA_method(engine_, &rsa_method_, sizeof(rsa_method_));
memset(&ecdsa_method_, 0, sizeof(ecdsa_method_));