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: I8d0072c279e4de87dc001190845d0ca6da233345
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/crypt_algo.cpp b/crypt_algo.cpp
index c51465f..75eea15 100644
--- a/crypt_algo.cpp
+++ b/crypt_algo.cpp
@@ -18,10 +18,9 @@
constexpr std::array<uint8_t, AlgoAES128::AESCBC128BlockSize - 1>
AlgoAES128::confPadBytes;
-std::vector<uint8_t>
- AlgoAES128::decryptPayload(const std::vector<uint8_t>& packet,
- const size_t sessHeaderLen,
- const size_t payloadLen) const
+std::vector<uint8_t> AlgoAES128::decryptPayload(
+ const std::vector<uint8_t>& packet, const size_t sessHeaderLen,
+ const size_t payloadLen) const
{
// verify packet size minimal: sessHeaderLen + payloadLen
// and payloadLen is more than AESCBC128ConfHeader
@@ -96,17 +95,16 @@
return encryptData(payload.data(), payload.size());
}
-std::vector<uint8_t> AlgoAES128::decryptData(const uint8_t* iv,
- const uint8_t* input,
- const int inputLen) const
+std::vector<uint8_t> AlgoAES128::decryptData(
+ const uint8_t* iv, const uint8_t* input, const int inputLen) const
{
// Initializes Cipher context
EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
auto cleanupFunc = [](EVP_CIPHER_CTX* ctx) { EVP_CIPHER_CTX_free(ctx); };
- std::unique_ptr<EVP_CIPHER_CTX, decltype(cleanupFunc)> ctxPtr(ctx,
- cleanupFunc);
+ std::unique_ptr<EVP_CIPHER_CTX, decltype(cleanupFunc)> ctxPtr(
+ ctx, cleanupFunc);
/*
* EVP_DecryptInit_ex sets up cipher context ctx for encryption with type
@@ -150,8 +148,8 @@
return output;
}
-std::vector<uint8_t> AlgoAES128::encryptData(const uint8_t* input,
- const int inputLen) const
+std::vector<uint8_t>
+ AlgoAES128::encryptData(const uint8_t* input, const int inputLen) const
{
std::vector<uint8_t> output(inputLen + AESCBC128BlockSize);
@@ -166,8 +164,8 @@
auto cleanupFunc = [](EVP_CIPHER_CTX* ctx) { EVP_CIPHER_CTX_free(ctx); };
- std::unique_ptr<EVP_CIPHER_CTX, decltype(cleanupFunc)> ctxPtr(ctx,
- cleanupFunc);
+ std::unique_ptr<EVP_CIPHER_CTX, decltype(cleanupFunc)> ctxPtr(
+ ctx, cleanupFunc);
/*
* EVP_EncryptInit_ex sets up cipher context ctx for encryption with type