commit e96063f05243774b10edcc1b29613b583c29b965
author Shawn Willden <swillden@google.com> Fri Apr 15 19:13:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 15 19:13:12 2016 +0000
tree 1ab6df2ca22520196e3fb32a731d8e11e18eb978
parent ff2e5051ae2cda043f9de2deb0bde5bd2ab28da6
parent c5e91c2e8409400395bb7187a7fb98c34722a34c

Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d
am: c5e91c2

* commit 'c5e91c2e8409400395bb7187a7fb98c34722a34c':
  Remove RSA_FLAG_EXT_PKEY from android_engine.cpp.

Change-Id: Ia232e2ce912486f5810bf025fff44cad8974c05a

keystore-engine/android_engine.cpp

diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index d23f169..d9c99fe 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -217,7 +217,7 @@
   NULL /* mod_exp */,
   NULL /* bn_mod_exp */,
 
-  RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE | RSA_FLAG_EXT_PKEY,
+  RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE,
 
   NULL /* keygen */,
   NULL /* multi_prime_keygen */,