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

[crypto] Allow cross-certificate source to be configured at build time 

Provide a build option CROSSCERT in config/crypto.h to allow the
default cross-signed certificate source to be configured at build
time.  The ${crosscert} setting may still be used to reconfigure the
cross-signed certificate source at runtime.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-03-24 19:25:03 +00:00
parent c4e8c40227
commit f8e1678b84
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/crypto.h
View File

@ -50,6 +50,14 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*/
#define TIMESTAMP_ERROR_MARGIN ( ( 12 * 60 + 30 ) * 60 )
/** Default cross-signed certificate source
*
* This is the default location from which iPXE will attempt to
* download cross-signed certificates in order to complete a
* certificate chain.
*/
#define CROSSCERT "http://ca.ipxe.org/auto"
#include <config/named.h>
#include NAMED_CONFIG(crypto.h)
#include <config/local/crypto.h>

3
src/net/validator.c
View File

@ -41,6 +41,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <ipxe/crc32.h>
#include <ipxe/ocsp.h>
#include <ipxe/validator.h>
#include <config/crypto.h>
/** @file
*
@ -133,7 +134,7 @@ const struct setting crosscert_setting __setting ( SETTING_CRYPTO, crosscert )={
};
/** Default cross-signed certificate source */
static const char crosscert_default[] = "http://ca.ipxe.org/auto";
static const char crosscert_default[] = CROSSCERT;
/**
* Append cross-signing certificates to certificate chain