Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use MLS_NAMESPACE everywhere needed #437

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Use MLS_NAMESPACE everywhere needed #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/hpke/test/userinfo_vc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace opt = MLS_NAMESPACE::tls::opt;
using namespace MLS_NAMESPACE::hpke;
using namespace std::string_literals;

namespace mls::hpke {
namespace MLS_NAMESPACE::hpke {

static bool
operator==(const Signature::PublicJWK& lhs, const Signature::PublicJWK& rhs)
Expand Down
10 changes: 5 additions & 5 deletions lib/mls_ds/src/tree_follower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@ TreeFollower::TreeFollower(TreeKEMPublicKey tree)
}

void
TreeFollower::update(const mls::MLSMessage& commit_message,
const std::vector<mls::MLSMessage>& extra_proposals)
TreeFollower::update(const MLSMessage& commit_message,
const std::vector<MLSMessage>& extra_proposals)
{
// Unwrap the Commit
const auto& commit_public_message =
var::get<mls::PublicMessage>(commit_message.message);
var::get<PublicMessage>(commit_message.message);
const auto commit_auth_content =
commit_public_message.authenticated_content();
const auto group_content = commit_auth_content.content;
const auto& commit =
var::get<mls::Commit>(commit_auth_content.content.content);
var::get<Commit>(commit_auth_content.content.content);

// Apply proposals
apply(_tree, _suite, group_content.sender, commit.proposals, extra_proposals);
Expand All @@ -156,7 +156,7 @@ TreeFollower::update(const mls::MLSMessage& commit_message,
// Merge the update path
if (commit.path) {
const auto sender =
var::get<mls::MemberSender>(group_content.sender.sender);
var::get<MemberSender>(group_content.sender.sender);
const auto from = LeafIndex(sender.sender);
const auto& path = opt::get(commit.path);
_tree.merge(from, path);
Expand Down
2 changes: 1 addition & 1 deletion test/grease.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <mls/core_types.h>
#include <mls/messages.h>

using namespace mls;
using namespace MLS_NAMESPACE;

TEST_CASE("GREASE capabilities")
{
Expand Down
Loading