feat: changed API to simple enroll

nqminds · Jan 15, 2024 · a4c70e5 · a4c70e5
1 parent dcd0a36
commit a4c70e5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/brski/masa/masa_api.hpp b/src/brski/masa/masa_api.hpp
@@ -21,9 +21,6 @@
 #define PATH_BRSKI_REQUESTAUDITLOG BRSKI_PREFIX_PATH "/requestauditlog"
 #define PATH_BRSKI_ENROLLSTATUS BRSKI_PREFIX_PATH "/enrollstatus"
 
-/* Not part of the standard */
-#define PATH_BRSKI_SIGNCERT BRSKI_PREFIX_PATH "/signcert"
-
 #define EST_PREFIX_PATH "/.well-known/est"
 #define PATH_EST_CACERTS EST_PREFIX_PATH "/cacerts"
 #define PATH_EST_SIMPLEENROLL EST_PREFIX_PATH "/simpleenroll"

diff --git a/src/brski/pledge/pledge_request.cpp b/src/brski/pledge/pledge_request.cpp
@@ -258,7 +258,7 @@ int post_sign_cert(struct pledge_config *pconf, struct registrar_config *rconf,
   struct BinaryArray pinned_domain_cert = {};
   int status;
   char *pki_str = NULL;
-  std::string path = PATH_BRSKI_SIGNCERT;
+  std::string path = PATH_EST_SIMPLEENROLL;
   std::string content_type = "application/voucher-cms+json";
   std::string registrar_ca_cert;
   ssize_t length;

diff --git a/src/brski/registrar/registrar_api.cpp b/src/brski/registrar/registrar_api.cpp
@@ -304,7 +304,7 @@ int registrar_enrollstatus(const RequestHeader &request_header,
   return 200;
 }
 
-int registrar_signcert(const RequestHeader &request_header,
+int registrar_est_simpleenroll(const RequestHeader &request_header,
                        const std::string &request_body,
                        CRYPTO_CERT peer_certificate,
                        ResponseHeader &response_header, std::string &response,
@@ -319,7 +319,7 @@ int registrar_signcert(const RequestHeader &request_header,
   struct BinaryArray *tls_ca_cert = NULL;
   ssize_t length;
 
-  log_trace("registrar_signcert:");
+  log_trace("registrar_est_simpleenroll:");
 
   char *cert_str = (char *)request_body.c_str();
 

diff --git a/src/brski/registrar/registrar_api.hpp b/src/brski/registrar/registrar_api.hpp
@@ -76,7 +76,7 @@ int registrar_enrollstatus(const RequestHeader &request_header,
  * @retval 500 Internal Server Error.
  * @retval 502 Bad Gateway
  */
-int registrar_signcert(const RequestHeader &request_header,
+int registrar_est_simpleenroll(const RequestHeader &request_header,
                        const std::string &request_body,
                        CRYPTO_CERT peer_certificate,
                        ResponseHeader &response_header, std::string &response,

diff --git a/src/brski/registrar/registrar_server.cpp b/src/brski/registrar/registrar_server.cpp
@@ -38,9 +38,9 @@ void setup_registrar_routes(std::vector<struct RouteTuple> &routes) {
                     .method = HTTP_METHOD_POST,
                     .handle = registrar_enrollstatus});
 
-  routes.push_back({.path = std::string(PATH_BRSKI_SIGNCERT),
+  routes.push_back({.path = std::string(PATH_EST_SIMPLEENROLL),
                     .method = HTTP_METHOD_POST,
-                    .handle = registrar_signcert});
+                    .handle = registrar_est_simpleenroll});
 }
 
 int registrar_start(struct registrar_config *rconf, struct masa_config *mconf,