From 361ef8b44fbf60a5c2649d2344fcc06c6c9fbe91 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Sat, 5 Oct 2024 13:31:40 +0000 Subject: [PATCH] fix failed refactors --- src/dpp/dave/leb128.cpp | 2 +- src/dpp/dave/parameters.cpp | 12 ++++++------ src/dpp/dave/persisted_key_pair_generic.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dpp/dave/leb128.cpp b/src/dpp/dave/leb128.cpp index 2e0a0f4315..8bbe12543f 100755 --- a/src/dpp/dave/leb128.cpp +++ b/src/dpp/dave/leb128.cpp @@ -68,7 +68,7 @@ uint64_t read_leb128(const uint8_t*& readAt, const uint8_t* end) return 0; } -size_t WriteLeb128(uint64_t value, uint8_t* buffer) +size_t write_leb128(uint64_t value, uint8_t* buffer) { int size = 0; while (value >= 0x80) { diff --git a/src/dpp/dave/parameters.cpp b/src/dpp/dave/parameters.cpp index 7cf6804863..965ba80b39 100755 --- a/src/dpp/dave/parameters.cpp +++ b/src/dpp/dave/parameters.cpp @@ -31,22 +31,22 @@ ::mlspp::CipherSuite::ID ciphersuite_id_for_protocol_version(protocol_version ve return ::mlspp::CipherSuite::ID::P256_AES128GCM_SHA256_P256; } -::mlspp::CipherSuite CiphersuiteForProtocolVersion(protocol_version version) noexcept +::mlspp::CipherSuite ciphersuite_for_protocol_version(protocol_version version) noexcept { return ::mlspp::CipherSuite{ciphersuite_id_for_protocol_version(version)}; } -::mlspp::CipherSuite::ID CiphersuiteIDForSignatureVersion(signature_version version) noexcept +::mlspp::CipherSuite::ID ciphersuite_id_for_signature_version(signature_version version) noexcept { return ::mlspp::CipherSuite::ID::P256_AES128GCM_SHA256_P256; } -::mlspp::CipherSuite CiphersuiteForSignatureVersion(signature_version version) noexcept +::mlspp::CipherSuite ciphersuite_for_signature_version(signature_version version) noexcept { return ::mlspp::CipherSuite{ciphersuite_id_for_protocol_version(version)}; } -::mlspp::Capabilities LeafNodeCapabilitiesForProtocolVersion(protocol_version version) noexcept +::mlspp::Capabilities leaf_node_capabilities_for_protocol_version(protocol_version version) noexcept { auto capabilities = ::mlspp::Capabilities::create_default(); @@ -56,12 +56,12 @@ ::mlspp::Capabilities LeafNodeCapabilitiesForProtocolVersion(protocol_version ve return capabilities; } -::mlspp::ExtensionList LeafNodeExtensionsForProtocolVersion(protocol_version version) noexcept +::mlspp::ExtensionList leaf_node_extensions_for_protocol_version(protocol_version version) noexcept { return ::mlspp::ExtensionList{}; } -::mlspp::ExtensionList GroupExtensionsForProtocolVersion( +::mlspp::ExtensionList group_extensions_for_protocol_version( protocol_version version, const ::mlspp::ExternalSender& externalSender) noexcept { diff --git a/src/dpp/dave/persisted_key_pair_generic.cpp b/src/dpp/dave/persisted_key_pair_generic.cpp index c41189b9c4..f0b11b79ae 100755 --- a/src/dpp/dave/persisted_key_pair_generic.cpp +++ b/src/dpp/dave/persisted_key_pair_generic.cpp @@ -84,7 +84,7 @@ static std::filesystem::path GetKeyStorageDirectory() namespace dpp::dave::mls::detail { -std::shared_ptr<::mlspp::SignaturePrivateKey> GetGenericPersistedKeyPair(key_pair_context_type ctx, +std::shared_ptr<::mlspp::SignaturePrivateKey> get_generic_persisted_key_pair(key_pair_context_type ctx, const std::string& id, ::mlspp::CipherSuite suite) { @@ -179,7 +179,7 @@ std::shared_ptr<::mlspp::SignaturePrivateKey> GetGenericPersistedKeyPair(key_pai } -bool DeleteGenericPersistedKeyPair(key_pair_context_type ctx, const std::string& id) +bool delete_generic_persisted_key_pair(key_pair_context_type ctx, const std::string& id) { std::error_code errc; std::filesystem::path dir = GetKeyStorageDirectory();