diff options
| author | Adam Langley <agl@google.com> | 2015-09-02 15:45:12 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 17:22:40 -0700 |
| commit | 241ffafa8ef52a503e7aaee31ead8c898c1b4126 (patch) | |
| tree | 5e4ba140e50b9ec4d0ea64d33ced26a5909fb316 | |
| parent | 7cb131772d450f03909f19045472ed555a97cd06 (diff) | |
| download | extras-241ffafa8ef52a503e7aaee31ead8c898c1b4126.tar.gz | |
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.
In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.
(cherry picked from commit 7a688f6e8774920cb8cfc52bf2e3c16976e8ff23)
Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f
| -rw-r--r-- | verity/verify_boot_signature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c index 58b7a194..fada61d0 100644 --- a/verity/verify_boot_signature.c +++ b/verity/verify_boot_signature.c @@ -72,7 +72,7 @@ IMPLEMENT_ASN1_FUNCTIONS(BootSignature) static BIO *g_error = NULL; -#if defined(OPENSSL_IS_BORINGSSL) +#if defined(OPENSSL_IS_BORINGSSL) && !defined(BORINGSSL_201509) /* In BoringSSL, ERR_print_errors has been moved to the BIO functions in order * to avoid the incorrect dependency of ERR on BIO. */ static void ERR_print_errors(BIO *bio) { |