commit 6d11e68e62496813e4f285d9965abd8ecf9cc992
author Kenny Root <kroot@google.com> Thu Sep 03 00:32:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 00:32:21 2015 +0000
tree d632dc82a69fc866dd8a38df7b2f4c84e3300ad3
parent 833c0b83da42ac813067be3f1f3d0c84d0502e34
parent db441ea6b3e7975f106a5a30407d27bc0c41144e

am db441ea6: Merge "Prepare for BoringSSL update."

* commit 'db441ea6b3e7975f106a5a30407d27bc0c41144e':
  Prepare for BoringSSL update.

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 */,
 };