commit 733539776541fa51bddf2d38fb57e556d563d9af
author Shawn Willden <swillden@google.com> Mon Nov 02 21:06:28 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 02 21:06:28 2015 +0000
tree 40fa57edfeb0e6e5b0496b9b48ca61dc4aa270fb
parent bc22f8d63e2ca24ee4ee9d61258d6704bc78724b
parent ddab0bb51320af9f277d98a4e36e77ea527503e5

Limit maximum number of concurrent keystore operations.
am: ddab0bb513

* commit 'ddab0bb51320af9f277d98a4e36e77ea527503e5':
  Limit maximum number of concurrent keystore operations.

keystore-engine/android_engine.cpp

diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index aa7bcbc..bb23823 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -220,6 +220,9 @@
   RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_OPAQUE | RSA_FLAG_EXT_PKEY,
 
   NULL /* keygen */,
+#if defined(BORINGSSL_201509)
+  NULL /* multi_prime_keygen */,
+#endif
   NULL /* supports_digest */,
 };