david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[crypto] Allow trusted certificates to be stored in non-volatile options 

The intention of the existing code (as documented in its own comments)
is that it should be possible to override the list of trusted root
certificates using a "trust" setting held in non-volatile stored
options.  However, the rootcert_init() function currently executes
before any devices have been probed, and so will not be able to
retrieve any such non-volatile stored options.

Fix by executing rootcert_init() only after devices have been probed.
Since startup functions may be executed multiple times (unlike
initialisation functions), add an explicit flag to preserve the
property that rootcert_init() should run only once.

As before, if an explicit root of trust is specified at build time,
then any runtime "trust" setting will be ignored.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-03-20 17:26:09 +00:00
parent 4a861cc61c
commit 0141ea3a77
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/crypto/rootcert.c
View File

@ -93,13 +93,14 @@ struct x509_root root_certificates = {
* a rebuild.
*/
static void rootcert_init ( void ) {
static int initialised;
void *external = NULL;
int len;
/* Allow trusted root certificates to be overridden only if
* not explicitly specified at build time.
*/
if ( ALLOW_TRUST_OVERRIDE ) {
if ( ALLOW_TRUST_OVERRIDE && ( ! initialised ) ) {
/* Fetch copy of "trust" setting, if it exists. This
* memory will never be freed.
@ -109,6 +110,9 @@ static void rootcert_init ( void ) {
root_certificates.fingerprints = external;
root_certificates.count = ( len / FINGERPRINT_LEN );
}
/* Prevent subsequent modifications */
initialised = 1;
}
DBGC ( &root_certificates, "ROOTCERT using %d %s certificate(s):\n",
@ -118,6 +122,6 @@ static void rootcert_init ( void ) {
}
/** Root certificate initialiser */
struct init_fn rootcert_init_fn __init_fn ( INIT_LATE ) = {
.initialise = rootcert_init,
struct startup_fn rootcert_startup_fn __startup_fn ( STARTUP_LATE ) = {
.startup = rootcert_init,
};