summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-10-22 00:09:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 00:09:31 +0000
commit54a201ef00b9b5d6b58b34b2429a08a98d37d7e9 (patch)
tree9a71afdadc8362e1a749710ddda0739de8427c83
parent66eec576a43ae05afb1f82f69e2e363ac475ac7b (diff)
parentd8feb9b2ba5ef762cce547620095ceeb75ac261e (diff)
downloadsecurity-54a201ef00b9b5d6b58b34b2429a08a98d37d7e9.tar.gz
Merge "system/security: remove BORINGSSL_201509 support."
am: d8feb9b2ba * commit 'd8feb9b2ba5ef762cce547620095ceeb75ac261e': system/security: remove BORINGSSL_201509 support.
-rw-r--r--keystore-engine/android_engine.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index bb23823f..d23f1693 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -220,9 +220,7 @@ const struct rsa_meth_st keystore_rsa_method = {
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 */,
};