Partial compile fixes

CMakeLists.txt

@@ -257,7 +257,7 @@ if(BUILD_TESTS)
  )
  use_client_mbedtls(kv_test)
  target_link_libraries(
- kv_test PRIVATE ${CMAKE_THREAD_LIBS_INIT} secp256k1.host
+ kv_test PRIVATE ${CMAKE_THREAD_LIBS_INIT} secp256k1.host http_parser.host
  )
 
  add_unit_test(
@@ -301,9 +301,10 @@ if(BUILD_TESTS)
  )
  target_include_directories(history_test PRIVATE ${EVERCRYPT_INC})
  target_link_libraries(
- history_test PRIVATE ${CRYPTO_LIBRARY} evercrypt.host secp256k1.host
+ history_test PRIVATE ${CRYPTO_LIBRARY} evercrypt.host secp256k1.host http_parser.host
  )
 
+
  add_unit_test(
  secret_sharing_test
  ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/secret_share.cpp
@@ -321,7 +322,7 @@ if(BUILD_TESTS)
  historical_queries_test
  ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/historical_queries.cpp
  )
- target_link_libraries(historical_queries_test PRIVATE secp256k1.host)
+ target_link_libraries(historical_queries_test PRIVATE secp256k1.host http_parser.host)
 
  add_unit_test(
  msgpack_serialization_test
@@ -408,7 +409,7 @@ if(BUILD_TESTS)
  ${CMAKE_CURRENT_SOURCE_DIR}/src/lua_interp/test/lua_kv.cpp
  )
  target_include_directories(lua_test PRIVATE ${LUA_DIR})
- target_link_libraries(lua_test PRIVATE lua.host)
+ target_link_libraries(lua_test PRIVATE lua.host http_parser.host)
 
  add_unit_test(
  merkle_test ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/merkle_test.cpp

python/setup.py

@@ -0,0 +1,42 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the Apache 2.0 License.
+
+from setuptools import setup # type: ignore
+from os import path
+
+PACKAGE_NAME = "ccf"
+UTILITIES_PATH = "utils"
+
+path_here = path.abspath(path.dirname(__file__))
+
+with open(path.join(path_here, "README.md"), encoding="utf-8") as f:
+ long_description = f.read()
+
+with open('requirements.txt') as f:
+ requirements = f.read().splitlines()
+
+setup(
+ name=PACKAGE_NAME,
+ version="0.13.2",
+ description="Set of tools and utilities for the Confidential Consortium Framework (CCF)",
+ long_description=long_description,
+ long_description_content_type="text/markdown",
+ url="https://github.com/microsoft/CCF/tree/master/python",
+ license="Apache License 2.0",
+ author="CCF Team",
+ classifiers=[
+ "Development Status :: 3 - Alpha",
+ "Intended Audience :: Developers",
+ "Programming Language :: Python :: 3",
+ ],
+ packages=[PACKAGE_NAME],
+ python_requires=">=3.7",
+ install_requires=requirements,
+ scripts=[
+ path.join(PACKAGE_NAME, "proposal_generator.py"),
+ path.join(UTILITIES_PATH, "keygenerator.sh"),
+ path.join(UTILITIES_PATH, "scurl.sh"),
+ path.join(UTILITIES_PATH, "submit_recovery_share.sh"),
+ ],
+ include_package_data=True,
+)

src/ds/openapi.h

@@ -21,20 +21,20 @@ namespace ds
  {
  namespace access
  {
- nlohmann::json& get_object(nlohmann::json& j, const std::string& k)
+ static nlohmann::json& get_object(nlohmann::json& j, const std::string& k)
  {
  const auto ib = j.emplace(k, nlohmann::json::object());
  return ib.first.value();
  }
 
- nlohmann::json& get_array(nlohmann::json& j, const std::string& k)
+ static nlohmann::json& get_array(nlohmann::json& j, const std::string& k)
  {
  const auto ib = j.emplace(k, nlohmann::json::array());
  return ib.first.value();
  }
  }
 
- nlohmann::json create_document(
+ static nlohmann::json create_document(
  const std::string& title,
  const std::string& description,
  const std::string& document_version)
@@ -49,29 +49,29 @@ namespace ds
  {"paths", nlohmann::json::object()}};
  }
 
- nlohmann::json& server(nlohmann::json& document, const std::string& url)
+ static nlohmann::json& server(nlohmann::json& document, const std::string& url)
  {
  auto& servers = access::get_object(document, "servers");
  servers.push_back({{"url", url}});
  return servers.back();
  }
 
- nlohmann::json& path(nlohmann::json& document, const std::string& path)
+ static nlohmann::json& path(nlohmann::json& document, const std::string& path)
  {
  // TODO: Check that path starts with /?
  auto& paths = access::get_object(document, "paths");
  return access::get_object(paths, path);
  }
 
- nlohmann::json& path_operation(nlohmann::json& path, http_method verb)
+ static nlohmann::json& path_operation(nlohmann::json& path, http_method verb)
  {
  // HTTP_GET becomes the string "get"
  std::string s = http_method_str(verb);
  nonstd::to_lower(s);
  return access::get_object(path, s);
  }
 
- nlohmann::json& response(
+ static nlohmann::json& response(
  nlohmann::json& path_operation,
  http_status status,
  const std::string& description = "Default response description")
@@ -85,7 +85,7 @@ namespace ds
  return response;
  }
 
- nlohmann::json& request_body(
+ static nlohmann::json& request_body(
  nlohmann::json& path_operation
  )
  {
@@ -94,7 +94,7 @@ namespace ds
  return request_body;
  }
 
- nlohmann::json& media_type(
+ static nlohmann::json& media_type(
  nlohmann::json& j,
  const std::string& mt
  )