diff options
| author | Michael Brown | 2018-03-18 21:27:49 +0100 |
|---|---|---|
| committer | Michael Brown | 2018-03-18 21:30:21 +0100 |
| commit | 9759860ec0c30685b53568b10caa5a91428bc7bf (patch) | |
| tree | 21eeee70897d800f3291ce614658a75e3284aa8b | |
| parent | [ocsp] Centralise test for whether or not an OCSP check is required (diff) | |
| download | ipxe-9759860ec0c30685b53568b10caa5a91428bc7bf.tar.gz ipxe-9759860ec0c30685b53568b10caa5a91428bc7bf.tar.xz ipxe-9759860ec0c30685b53568b10caa5a91428bc7bf.zip | |
[ocsp] Allow OCSP checks to be disabled
Some CAs provide non-functional OCSP servers, and some clients are
forced to operate on networks without access to the OCSP servers.
Allow the user to explicitly disable the use of OCSP checks by
undefining OCSP_CHECK in config/crypto.h.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/config/crypto.h | 8 | ||||
| -rw-r--r-- | src/include/ipxe/ocsp.h | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/config/crypto.h b/src/config/crypto.h index 8f885c55..1edcdce4 100644 --- a/src/config/crypto.h +++ b/src/config/crypto.h @@ -58,6 +58,14 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ #define CROSSCERT "http://ca.ipxe.org/auto" +/** Perform OCSP checks when applicable + * + * Some CAs provide non-functional OCSP servers, and some clients are + * forced to operate on networks without access to the OCSP servers. + * Allow the user to explicitly disable the use of OCSP checks. + */ +#define OCSP_CHECK + #include <config/named.h> #include NAMED_CONFIG(crypto.h) #include <config/local/crypto.h> diff --git a/src/include/ipxe/ocsp.h b/src/include/ipxe/ocsp.h index 9a6b3fe6..be0bddc5 100644 --- a/src/include/ipxe/ocsp.h +++ b/src/include/ipxe/ocsp.h @@ -14,6 +14,14 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/asn1.h> #include <ipxe/x509.h> #include <ipxe/refcnt.h> +#include <config/crypto.h> + +/* Allow OCSP to be disabled completely */ +#ifdef OCSP_CHECK +#define OCSP_ENABLED 1 +#else +#define OCSP_ENABLED 0 +#endif /** OCSP algorithm identifier */ #define OCSP_ALGORITHM_IDENTIFIER( ... ) \ @@ -119,6 +127,10 @@ ocsp_put ( struct ocsp_check *ocsp ) { */ static inline int ocsp_required ( struct x509_certificate *cert ) { + /* An OCSP check is never required if OCSP checks are disabled */ + if ( ! OCSP_ENABLED ) + return 0; + /* An OCSP check is required if an OCSP URI exists but the * OCSP status is not (yet) good. */ |