[accless] E: Remove Redundant Headers In Attestation Lib

Author: csegarragonz

accless/libs/attestation/attestation.h

@@ -11,30 +11,11 @@
 
 namespace accless::attestation {
 
-// We copy this structures from:
-// https://github.com/torvalds/linux/blob/master/include/uapi/linux/sev-guest.h#L80
-constexpr size_t SNP_REPORT_USER_DATA_SIZE = 64;
-constexpr size_t SNP_REPORT_RESP_SIZE = 4000;
-
-// FIXME: check if all of these are used
-constexpr size_t SGX_REPORT_DATA_SIZE = 64;
-constexpr size_t SNP_REPORT_DATA_SIZE = 64;
-constexpr size_t MOCK_QUOTE_HEADER_SIZE = 16;
-constexpr uint32_t MOCK_QUOTE_VERSION = 1;
+// FIXME(#44): eventually move this to an accless AES-GCM library.
 constexpr size_t AES_128_KEY_SIZE = 16;
 constexpr size_t AES_GCM_IV_SIZE = 12;
 constexpr size_t AES_GCM_TAG_SIZE = 16;
 
-struct snp_report_req {
-    uint8_t user_data[SNP_REPORT_USER_DATA_SIZE];
-    uint32_t vmpl;
-    uint8_t rsvd[28];
-};
-
-struct snp_report_resp {
-    uint8_t data[SNP_REPORT_RESP_SIZE];
-};
-
 namespace utils {
 // Helper methods
 std::string extractJsonStringField(const std::string &json,

accless/libs/attestation/mock.cpp

@@ -11,6 +11,9 @@
 #include <stdexcept>
 
 namespace accless::attestation::mock {
+constexpr size_t MOCK_QUOTE_HEADER_SIZE = 16;
+constexpr uint32_t MOCK_QUOTE_VERSION = 1;
+
 std::vector<uint8_t> buildMockQuote(const std::vector<uint8_t> &reportData,
                                     const std::array<uint8_t, 8> &magic) {
     std::vector<uint8_t> quote;
@@ -34,67 +37,4 @@ std::vector<uint8_t> buildMockQuote(const std::vector<uint8_t> &reportData,
 
     return quote;
 }
-
-/*
-size_t mockCurlWriteCallback(char *ptr, size_t size, size_t nmemb,
-                             void *userdata) {
-    size_t total = size * nmemb;
-    auto *response = static_cast<std::string *>(userdata);
-    response->append(ptr, total);
-    return total;
-}
-
-std::string postMockQuote(const std::string &url, const std::string &certPath,
-                          const std::string &body,
-                          const std::string &endpoint) {
-    CURL *curl = curl_easy_init();
-    if (curl == nullptr) {
-        throw std::runtime_error("accless(att): failed to init curl");
-    }
-
-    char errbuf[CURL_ERROR_SIZE];
-    errbuf[0] = 0;
-
-    std::string response;
-    std::string fullUrl = url + endpoint;
-    curl_easy_setopt(curl, CURLOPT_URL, fullUrl.c_str());
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
-    curl_easy_setopt(curl, CURLOPT_CAINFO, certPath.c_str());
-    curl_easy_setopt(curl, CURLOPT_POST, 1L);
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE,
-                     static_cast<long>(body.size()));
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, mockCurlWriteCallback);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
-
-    struct curl_slist *headers = nullptr;
-    headers = curl_slist_append(headers, "Content-Type: application/json");
-    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
-
-    CURLcode res = curl_easy_perform(curl);
-    long status = 0;
-    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status);
-    curl_easy_cleanup(curl);
-    curl_slist_free_all(headers);
-
-    if (res != CURLE_OK) {
-        size_t len = strlen(errbuf);
-        fprintf(stderr, "accless(att): curl error: ");
-        if (len) {
-            fprintf(stderr, "%s%s", errbuf,
-                    ((errbuf[len - 1] != '\n') ? "\n" : ""));
-        } else {
-            fprintf(stderr, "%s\n", curl_easy_strerror(res));
-        }
-        throw std::runtime_error("accless(att): curl error posting mock quote");
-    }
-    if (status != 200) {
-        throw std::runtime_error(
-            "accless(att): attestation service rejected mock quote");
-    }
-
-    return response;
-}
-*/
 } // namespace accless::attestation::mock

accless/libs/attestation/mock_sgx.cpp

@@ -6,6 +6,7 @@
 
 namespace accless::attestation::mock {
 
+constexpr size_t SGX_REPORT_DATA_SIZE = 64;
 const std::array<uint8_t, 8> MOCK_QUOTE_MAGIC_SGX = {'A', 'C', 'C', 'L',
                                                      'S', 'G', 'X', '!'};
 
@@ -14,7 +15,8 @@ std::string getMockSgxAttestationJwt() {
     accless::attestation::ec::EcKeyPair keyPair;
 
     // Embed EC keypair in empty (mocked) SGX quote.
-    auto reportData = keyPair.getReportData();
+    std::array<uint8_t, SGX_REPORT_DATA_SIZE> reportData =
+        keyPair.getReportData();
     std::vector<uint8_t> reportVec(reportData.begin(), reportData.end());
 
     // Populate the mocked quote.

accless/libs/attestation/snp.cpp

@@ -197,7 +197,7 @@ std::string getAttestationJwt(const std::string &gid,
     accless::attestation::ec::EcKeyPair keyPair;
 
     // Get auxiliary report data: serialized public halve of the EC keypair.
-    std::array<uint8_t, SGX_REPORT_DATA_SIZE> reportData =
+    std::array<uint8_t, SNP_REPORT_USER_DATA_SIZE> reportData =
         keyPair.getReportData();
     std::vector<uint8_t> reportDataVec(reportData.begin(), reportData.end());