diff options
| author | Kenny Root <kroot@google.com> | 2015-09-03 00:32:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 00:32:23 +0000 |
| commit | 9c8f0965f1af2fedd4423d449089d36f0ce71fab (patch) | |
| tree | cceb3f3a4af7935915ec1352550d024fdb5bd97f /verity | |
| parent | 2436dd4769130a535bbf112b0d3381c5eeabf6f8 (diff) | |
| parent | 65fd650a4ae3d8602bffc0fa469695228209e38b (diff) | |
| download | extras-9c8f0965f1af2fedd4423d449089d36f0ce71fab.tar.gz | |
am 65fd650a: Merge "Prepare for BoringSSL update."
* commit '65fd650a4ae3d8602bffc0fa469695228209e38b':
Prepare for BoringSSL update.
Diffstat (limited to 'verity')
| -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) { |