diff options
| author | Adam Langley <agl@google.com> | 2015-09-02 15:28:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 17:15:26 -0700 |
| commit | 358bd1156745a470f87dacfd509d2876e7ef6327 (patch) | |
| tree | 801f2eb8266591ef7336df7d278062b51b052539 | |
| parent | c2120744da8d0612ad54484b314f94e1e6e3a167 (diff) | |
| download | android_system_security-358bd1156745a470f87dacfd509d2876e7ef6327.tar.gz android_system_security-358bd1156745a470f87dacfd509d2876e7ef6327.tar.bz2 android_system_security-358bd1156745a470f87dacfd509d2876e7ef6327.zip | |
Prepare for BoringSSL update.
This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.
(cherry picked from commit 9eb9295d78a4fbfb4b4916d597a5fcb6ee2d5677)
Change-Id: I3d09b5644661353723803bcbda937d34455849a5
| -rw-r--r-- | keystore-engine/android_engine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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 */, }; |