summaryrefslogtreecommitdiff
path: root/verity
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-03-18 17:35:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-18 17:35:48 +0000
commitefa043704bcbdc98b6c29a27f3a42caccb174664 (patch)
treef7439de5e61271ebcd36229a6f39bfac45a4cf58 /verity
parent04892232fb748347f4b6ebbe2b41db80b58b86a0 (diff)
parente3ec11c2d95cc03be01426d13ea87fc8edb3daad (diff)
downloadextras-efa043704bcbdc98b6c29a27f3a42caccb174664.tar.gz
Merge "system/extras/verity: BoringSSL fix."
Diffstat (limited to 'verity')
-rw-r--r--verity/verify_boot_signature.c9
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