make hpke use dpp nlohmann

brainboxdotcc · Sep 25, 2024 · e33f95e · e33f95e
1 parent 97eebb4
commit e33f95e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/mlspp/lib/hpke/CMakeLists.txt b/mlspp/lib/hpke/CMakeLists.txt
@@ -59,4 +59,5 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../lib/bytes/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../lib/hpke/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../lib/mls_vectors/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../lib/tls_syntax/include")
-
+# For nlohmann/json.hpp
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../../include")
diff --git a/mlspp/lib/hpke/src/signature.cpp b/mlspp/lib/hpke/src/signature.cpp
@@ -6,7 +6,7 @@
 #include "dhkem.h"
 #include "rsa.h"
 
-#include "dpp/nlohmann/json.hpp"
+#include <dpp/json.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>

diff --git a/mlspp/lib/hpke/src/userinfo_vc.cpp b/mlspp/lib/hpke/src/userinfo_vc.cpp
@@ -1,7 +1,7 @@
 #include <hpke/base64.h>
 #include <hpke/signature.h>
 #include <hpke/userinfo_vc.h>
-#include "dpp/nlohmann/json.hpp"
+#include <dpp/json.h>
 #include <tls/compat.h>
 
 using nlohmann::json;