commit bd79bce8c3f1deb1fb2773868b9ece25233cf27b
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:22:20 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Sat Aug 17 00:19:54 2024 +0000
tree 93a2ae6921c756650182885f1215aae2923a1169
parent cdf25ffb6b2d99c829094c9a4c4907aec46e3a2e

clang-format: re-format for clang-18

clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version.  The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.

See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.

Change-Id: Iceec1dc95b6c908ec6c21fb40093de9dd18bf11a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

src/json_html_serializer.cpp

diff --git a/src/json_html_serializer.cpp b/src/json_html_serializer.cpp
index d35cab9..d462f5e 100644
--- a/src/json_html_serializer.cpp
+++ b/src/json_html_serializer.cpp
@@ -185,10 +185,10 @@
                                 // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
                                 std::snprintf(
                                     &stringBuffer[bytes], 13, "\\u%04x\\u%04x",
-                                    static_cast<uint16_t>(0xD7C0 +
-                                                          (codePoint >> 10)),
-                                    static_cast<uint16_t>(0xDC00 +
-                                                          (codePoint & 0x3FF)));
+                                    static_cast<uint16_t>(
+                                        0xD7C0 + (codePoint >> 10)),
+                                    static_cast<uint16_t>(
+                                        0xDC00 + (codePoint & 0x3FF)));
                                 bytes += 12;
                             }
                         }

src/ssl_key_handler.cpp

diff --git a/src/ssl_key_handler.cpp b/src/ssl_key_handler.cpp
index 1d4039c..705d687 100644
--- a/src/ssl_key_handler.cpp
+++ b/src/ssl_key_handler.cpp
@@ -38,15 +38,16 @@
 
 // Mozilla intermediate cipher suites v5.7
 // Sourced from: https://ssl-config.mozilla.org/guidelines/5.7.json
-constexpr const char* mozillaIntermediate = "ECDHE-ECDSA-AES128-GCM-SHA256:"
-                                            "ECDHE-RSA-AES128-GCM-SHA256:"
-                                            "ECDHE-ECDSA-AES256-GCM-SHA384:"
-                                            "ECDHE-RSA-AES256-GCM-SHA384:"
-                                            "ECDHE-ECDSA-CHACHA20-POLY1305:"
-                                            "ECDHE-RSA-CHACHA20-POLY1305:"
-                                            "DHE-RSA-AES128-GCM-SHA256:"
-                                            "DHE-RSA-AES256-GCM-SHA384:"
-                                            "DHE-RSA-CHACHA20-POLY1305";
+constexpr const char* mozillaIntermediate =
+    "ECDHE-ECDSA-AES128-GCM-SHA256:"
+    "ECDHE-RSA-AES128-GCM-SHA256:"
+    "ECDHE-ECDSA-AES256-GCM-SHA384:"
+    "ECDHE-RSA-AES256-GCM-SHA384:"
+    "ECDHE-ECDSA-CHACHA20-POLY1305:"
+    "ECDHE-RSA-CHACHA20-POLY1305:"
+    "DHE-RSA-AES128-GCM-SHA256:"
+    "DHE-RSA-AES256-GCM-SHA384:"
+    "DHE-RSA-CHACHA20-POLY1305";
 
 // Trust chain related errors.`
 bool isTrustChainError(int errnum)
@@ -145,8 +146,8 @@
     BIO_free(bufio);
     if (pkey != nullptr)
     {
-        EVP_PKEY_CTX* pkeyCtx = EVP_PKEY_CTX_new_from_pkey(nullptr, pkey,
-                                                           nullptr);
+        EVP_PKEY_CTX* pkeyCtx =
+            EVP_PKEY_CTX_new_from_pkey(nullptr, pkey, nullptr);
 
         if (pkeyCtx == nullptr)
         {
@@ -454,10 +455,9 @@
     return SSL_TLSEXT_ERR_OK;
 }
 
-static int alpnSelectProtoCallback(SSL* /*unused*/, const unsigned char** out,
-                                   unsigned char* outlen,
-                                   const unsigned char* in, unsigned int inlen,
-                                   void* /*unused*/)
+static int alpnSelectProtoCallback(
+    SSL* /*unused*/, const unsigned char** out, unsigned char* outlen,
+    const unsigned char* in, unsigned int inlen, void* /*unused*/)
 {
     int rv = nghttp2_select_alpn(out, outlen, in, inlen);
     if (rv == -1)
@@ -474,12 +474,13 @@
 static bool getSslContext(boost::asio::ssl::context& mSslContext,
                           const std::string& sslPemFile)
 {
-    mSslContext.set_options(boost::asio::ssl::context::default_workarounds |
-                            boost::asio::ssl::context::no_sslv2 |
-                            boost::asio::ssl::context::no_sslv3 |
-                            boost::asio::ssl::context::single_dh_use |
-                            boost::asio::ssl::context::no_tlsv1 |
-                            boost::asio::ssl::context::no_tlsv1_1);
+    mSslContext.set_options(
+        boost::asio::ssl::context::default_workarounds |
+        boost::asio::ssl::context::no_sslv2 |
+        boost::asio::ssl::context::no_sslv3 |
+        boost::asio::ssl::context::single_dh_use |
+        boost::asio::ssl::context::no_tlsv1 |
+        boost::asio::ssl::context::no_tlsv1_1);
 
     BMCWEB_LOG_DEBUG("Using default TrustStore location: {}", trustStorePath);
     mSslContext.add_verify_path(trustStorePath);