Fixes for code brought in via rebase.

cisco · Aug 28, 2023 · 36f14bc · 36f14bc
1 parent 2410545
commit 36f14bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/lib/hpke/include/hpke/base64.h b/lib/hpke/include/hpke/base64.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <bytes/bytes.h>
-using namespace bytes_ns;
+using namespace MLS_NAMESPACE::bytes_ns;
 
-namespace hpke {
+namespace MLS_NAMESPACE::hpke {
 
 std::string
 to_base64(const bytes& data);
@@ -17,4 +17,4 @@ from_base64(const std::string& enc);
 bytes
 from_base64url(const std::string& enc);
 
-} // namespace hpke
+} // namespace MLS_NAMESPACE::hpke
diff --git a/lib/hpke/src/base64.cpp b/lib/hpke/src/base64.cpp
@@ -6,7 +6,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-namespace hpke {
+namespace MLS_NAMESPACE::hpke {
 
 std::string
 to_base64(const bytes& data)
@@ -98,4 +98,4 @@ from_base64url(const std::string& enc)
   return from_base64(enc_copy);
 }
 
-} // namespace hpke
+} // namespace MLS_NAMESPACE::hpke
diff --git a/lib/hpke/src/signature.cpp b/lib/hpke/src/signature.cpp
@@ -5,8 +5,9 @@
 #include <string>
 
 #include "dhkem.h"
+#include "rsa.h"
 
-#include <lohmann/json.hpp>
+#include <nlohmann/json.hpp>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>

diff --git a/lib/hpke/test/base64.cpp b/lib/hpke/test/base64.cpp
@@ -1,8 +1,8 @@
 #include <doctest/doctest.h>
 #include <hpke/base64.h>
 
-using namespace hpke;
-using namespace bytes_ns;
+using namespace MLS_NAMESPACE::hpke;
+using namespace MLS_NAMESPACE::bytes_ns;
 
 TEST_CASE("To Base64 / To Base64Url")
 {