From e33f95ec639536ceb82d7bf4930d10a17b81ceee Mon Sep 17 00:00:00 2001
From: Craig Edwards <craigedwards@brainbox.cc>
Date: Wed, 25 Sep 2024 15:38:39 +0000
Subject: [PATCH] make hpke use dpp nlohmann

---
 mlspp/lib/hpke/CMakeLists.txt      | 3 ++-
 mlspp/lib/hpke/src/signature.cpp   | 2 +-
 mlspp/lib/hpke/src/userinfo_vc.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mlspp/lib/hpke/CMakeLists.txt b/mlspp/lib/hpke/CMakeLists.txt
index f27690f8ad..f3b88977f9 100755
--- 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
index a866b2843c..97d7b9181c 100755
--- 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
index e211a821ca..fea3d8ea31 100755
--- 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;