pvmfw: Call CRYPTO_library_init before using BSSL
The library expects to have been initialized before being used. It is a
noop if BORINGSSL_NO_STATIC_INITIALIZER is not set i.e. if static
initializers are being used.
Test: atest MicrodroidTests
Change-Id: I35f486015a0c18224dec702fd0e1b11dc42a5e34
diff --git a/pvmfw/src/crypto.rs b/pvmfw/src/crypto.rs
index 275de7a..0785a7a 100644
--- a/pvmfw/src/crypto.rs
+++ b/pvmfw/src/crypto.rs
@@ -14,8 +14,6 @@
//! Wrapper around BoringSSL/OpenSSL symbols.
-use crate::cstr;
-
use core::convert::AsRef;
use core::ffi::{c_char, c_int, CStr};
use core::fmt;
@@ -23,6 +21,9 @@
use core::num::NonZeroU32;
use core::ptr;
+use crate::cstr;
+
+use bssl_ffi::CRYPTO_library_init;
use bssl_ffi::ERR_get_error_line;
use bssl_ffi::ERR_lib_error_string;
use bssl_ffi::ERR_reason_error_string;
@@ -298,3 +299,8 @@
Err(ErrorIterator {})
}
}
+
+pub fn init() {
+ // SAFETY - Configures the internal state of the library - may be called multiple times.
+ unsafe { CRYPTO_library_init() }
+}
diff --git a/pvmfw/src/entry.rs b/pvmfw/src/entry.rs
index 8219882..ffbc4a8 100644
--- a/pvmfw/src/entry.rs
+++ b/pvmfw/src/entry.rs
@@ -15,6 +15,7 @@
//! Low-level entry and exit points of pvmfw.
use crate::config;
+use crate::crypto;
use crate::debug_policy::{handle_debug_policy, DebugPolicyError};
use crate::fdt;
use crate::heap;
@@ -192,6 +193,8 @@
RebootReason::InternalError
})?;
+ crypto::init();
+
// SAFETY - We only get the appended payload from here, once. It is mapped and the linker
// script prevents it from overlapping with other objects.
let appended_data = unsafe { get_appended_data_slice() };