From 9759860ec0c30685b53568b10caa5a91428bc7bf Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 18 Mar 2018 22:27:49 +0200 Subject: [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 --- src/config/crypto.h | 8 ++++++++ src/include/ipxe/ocsp.h | 12 ++++++++++++ 2 files changed, 20 insertions(+) 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 #include NAMED_CONFIG(crypto.h) #include 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 #include #include +#include + +/* 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. */ -- cgit v1.2.3-55-g7522