Skip to content

Commit

Permalink
Reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
cjen1-msft committed Feb 28, 2025
1 parent face827 commit 8d6f848
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,7 @@ if(BUILD_TESTS)
${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/snp_attestation_verification.cpp
${CCF_DIR}/src/node/quote.cpp
)
target_link_libraries(
snp_attestation_verification PRIVATE ccf_kv.host
)
target_link_libraries(snp_attestation_verification PRIVATE ccf_kv.host)
endif()

add_unit_test(map_test ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/map_test.cpp)
Expand Down
2 changes: 1 addition & 1 deletion include/ccf/pal/snp_ioctl5.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include "ccf/pal/attestation_sev_snp.h"
#include "ccf/ds/logger.h"
#include "ccf/pal/attestation_sev_snp.h"

#include <fcntl.h>
#include <stdint.h>
Expand Down
4 changes: 2 additions & 2 deletions src/node/test/snp_attestation_verification.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the Apache 2.0 License.

#include "ccf/ds/quote_info.h"
#include "ccf/node/quote.h"
#include "ccf/pal/attestation_sev_snp.h"
#include "ccf/pal/snp_ioctl.h"
#include "ccf/service/tables/tcb_verification.h"
#include "ccf/node/quote.h"
#include "kv/store.h"
#include "kv/test/null_encryptor.h"
#include "pal/quote_generation.h"
#include "ccf/ds/quote_info.h"

#include <random>
#include <span>
Expand Down
24 changes: 20 additions & 4 deletions src/service/internal_tables_access.h
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,11 @@ namespace ccf
.extended_family = 0x0A,
.reserved2 = 0});
constexpr pal::snp::TcbVersion milan_tcb_version = {
.boot_loader = 0, .tee = 0, .reserved={0}, .snp = 0x18, .microcode = 0xDB};
.boot_loader = 0,
.tee = 0,
.reserved = {0},
.snp = 0x18,
.microcode = 0xDB};
h->put(milan_chip_id, milan_tcb_version);

constexpr auto milan_x_chip_id = pal::snp::get_attest_chip_model(
Expand All @@ -848,7 +852,11 @@ namespace ccf
.extended_family = 0x0A,
.reserved2 = 0});
constexpr pal::snp::TcbVersion milan_x_tcb_version = {
.boot_loader = 0, .tee = 0, .reserved={0}, .snp = 0x18, .microcode = 0x44};
.boot_loader = 0,
.tee = 0,
.reserved = {0},
.snp = 0x18,
.microcode = 0x44};
h->put(milan_x_chip_id, milan_x_tcb_version);

constexpr auto genoa_chip_id = pal::snp::get_attest_chip_model(
Expand All @@ -860,7 +868,11 @@ namespace ccf
.extended_family = 0x0A,
.reserved2 = 0});
constexpr pal::snp::TcbVersion genoa_tcb_version = {
.boot_loader = 0, .tee = 0, .reserved={0}, .snp = 0x17, .microcode = 0x54};
.boot_loader = 0,
.tee = 0,
.reserved = {0},
.snp = 0x17,
.microcode = 0x54};
h->put(genoa_chip_id, genoa_tcb_version);

constexpr auto genoa_x_chip_id = pal::snp::get_attest_chip_model(
Expand All @@ -872,7 +884,11 @@ namespace ccf
.extended_family = 0x0A,
.reserved2 = 0});
constexpr pal::snp::TcbVersion genoa_x_tcb_version = {
.boot_loader = 0, .tee = 0, .reserved={0}, .snp = 0x17, .microcode = 0x4F};
.boot_loader = 0,
.tee = 0,
.reserved = {0},
.snp = 0x17,
.microcode = 0x4F};
h->put(genoa_x_chip_id, genoa_x_tcb_version);
}

Expand Down

0 comments on commit 8d6f848

Please sign in to comment.