commit 54a201ef00b9b5d6b58b34b2429a08a98d37d7e9
author Kenny Root <kroot@google.com> Thu Oct 22 00:09:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 00:09:31 2015 +0000
tree 9a71afdadc8362e1a749710ddda0739de8427c83
parent 66eec576a43ae05afb1f82f69e2e363ac475ac7b
parent d8feb9b2ba5ef762cce547620095ceeb75ac261e

Merge "system/security: remove BORINGSSL_201509 support."
am: d8feb9b2ba

* commit 'd8feb9b2ba5ef762cce547620095ceeb75ac261e':
  system/security: remove BORINGSSL_201509 support.

keystore-engine/android_engine.cpp

diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index bb23823..d23f169 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -220,9 +220,7 @@
   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 */,
 };