diff options
| author | Kenny Root <kroot@google.com> | 2015-03-18 17:51:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 17:51:48 +0000 |
| commit | 26f464164d400c5a1db8ee6fe4991d388b85481a (patch) | |
| tree | a8c48016fcae6ce62fb733d1f74d60831c81d511 /verity | |
| parent | 355e08d8780a06ebc965b982634e36499ab2ca21 (diff) | |
| parent | efa043704bcbdc98b6c29a27f3a42caccb174664 (diff) | |
| download | extras-26f464164d400c5a1db8ee6fe4991d388b85481a.tar.gz | |
am efa04370: Merge "system/extras/verity: BoringSSL fix."
* commit 'efa043704bcbdc98b6c29a27f3a42caccb174664':
system/extras/verity: BoringSSL fix.
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/verify_boot_signature.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c index 2274291b..55591aaf 100644 --- a/verity/verify_boot_signature.c +++ b/verity/verify_boot_signature.c @@ -24,6 +24,7 @@ #include <sys/types.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <openssl/asn1.h> #include <openssl/asn1t.h> @@ -69,6 +70,14 @@ IMPLEMENT_ASN1_FUNCTIONS(BootSignature) static BIO *g_error = NULL; +#if defined(OPENSSL_IS_BORINGSSL) +/* 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) { + BIO_print_errors(bio); +} +#endif + /** * Rounds n up to the nearest multiple of page_size * @param n The value to round |