diff options
| author | Ed Tanous <ed@tanous.net> | 2024-04-13 19:11:15 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2024-04-18 18:40:17 +0300 |
| commit | 8db83747b6ea72de30ac83f19578ecc37489b13d (patch) | |
| tree | 86bd287fc7fa1a93df5761af93554ef45f9bdc18 /config | |
| parent | 3e7374243ff53125f3a55c2d0b1927e89261b1f9 (diff) | |
| download | bmcweb-8db83747b6ea72de30ac83f19578ecc37489b13d.tar.xz | |
Clean up BMCWEB_ENABLE_SSL
This macro came originally from CROW_ENABLE_SSL, and was used as a macro
to optionally compile without openssl being required.
OpenSSL has been pulled into many other dependencies, and has been
functionally required to be included for a long time, so there's no
reason to hold onto this macro.
Remove most uses of the macro, and for the couple functional places the
macro is used, transition to a constexpr if to enable the TLS paths.
This allows a large simplification of code in some places.
Tested: Redfish service validator passes.
Change-Id: Iebd46a68e5e417b6031479e24be3c21bef782f4c
Signed-off-by: Ed Tanous <ed@tanous.net>
Diffstat (limited to 'config')
| -rw-r--r-- | config/bmcweb_config.h.in | 2 | ||||
| -rw-r--r-- | config/meson.build | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/bmcweb_config.h.in b/config/bmcweb_config.h.in index 476379645f..d3b174c470 100644 --- a/config/bmcweb_config.h.in +++ b/config/bmcweb_config.h.in @@ -21,5 +21,7 @@ constexpr const bool bmcwebEnableMultiHost = @BMCWEB_ENABLE_MULTI_HOST@ == 1; constexpr const bool bmcwebEnableHTTP2 = @BMCWEB_ENABLE_HTTP2@ == 1; +constexpr const bool bmcwebEnableTLS = @BMCWEB_ENABLE_TLS@ == 1; + constexpr const bool bmcwebMTLSCommonNameParsingMeta = @BMCWEB_ENABLE_MTLS_COMMON_NAME_PARSING_META@ == 1; // clang-format on diff --git a/config/meson.build b/config/meson.build index 21da40e077..1c6f78a999 100644 --- a/config/meson.build +++ b/config/meson.build @@ -19,6 +19,10 @@ enable_multi_host = get_option('experimental-redfish-multi-computer-system') conf_data.set10('BMCWEB_ENABLE_MULTI_HOST', enable_multi_host.allowed()) enable_http2 = get_option('experimental-http2') conf_data.set10('BMCWEB_ENABLE_HTTP2', enable_http2.allowed()) + +enable_tls = get_option('insecure-disable-ssl') +conf_data.set10('BMCWEB_ENABLE_TLS', enable_tls.disabled()) + conf_data.set10( 'BMCWEB_ENABLE_MTLS_COMMON_NAME_PARSING_META', get_option('mutual-tls-common-name-parsing') == 'meta', |