Skip to content

Commit

Permalink
Merge pull request #18197 from michael-redpanda/CORE-2742-Post-review…
Browse files Browse the repository at this point in the history
…-updates

CORE-2742 post review updates
  • Loading branch information
michael-redpanda authored May 7, 2024
2 parents 6c630bd + 9e3264c commit 11c0cb8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/v/config/node_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ node_config::node_config() noexcept
"file does not exist or does not return '1', Redpanda immediately "
"exits. After the check is complete, Redpanda loads the "
"OpenSSL FIPS provider into the OpenSSL library. After this is "
"complete, Redpanda is operating in FIPS mode. This means that the "
"available TLS cipher suites available to users are limited to TLSv1.2 "
"complete, Redpanda is operating in FIPS mode, which means that the "
"TLS cipher suites available to users are limited to TLSv1.2 "
"and TLSv1.3, and of those, only the ones that use NIST-approved "
"cryptographic methods. For more information about FIPS, refer to "
"Redpanda documentation.",
Expand Down
7 changes: 3 additions & 4 deletions src/v/redpanda/application.cc
Original file line number Diff line number Diff line change
Expand Up @@ -899,10 +899,9 @@ void application::check_environment() {
fd.read(buf, 1);
if (buf[0] != '1') {
throw std::runtime_error(fmt::format(
"File '{}' not reporting '1': '{}'. Redpanda cannot start in "
"FIPS mode",
fips_enabled_file,
std::string(&buf[0], 1)));
"File '{}' not reporting '1'. Redpanda cannot start in FIPS "
"mode",
fips_enabled_file));
}
syschecks::systemd_message("Starting Redpanda in FIPS mode").get();
}
Expand Down

0 comments on commit 11c0cb8

Please sign in to comment.