Skip to content

Fix remote report data mismatch #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2020
Merged

Fix remote report data mismatch #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions enclave/src/c_api/c_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ int get_remote_report_with_pubkey_and_nonce(

#else
uint8_t report_data[CIPHER_PK_SIZE + CIPHER_IV_SIZE];
std::copy(public_key, public_key + CIPHER_PK_SIZE, report_data);
std::copy(enclave_nonce, enclave_nonce + CIPHER_IV_SIZE, report_data + CIPHER_PK_SIZE);
if (generate_remote_report(report_data, CIPHER_PK_SIZE + CIPHER_IV_SIZE + CIPHER_KEY_SIZE, &report, &report_size)) {
memcpy(report_data, public_key, CIPHER_PK_SIZE);
memcpy(report_data + CIPHER_PK_SIZE, enclave_nonce, CIPHER_IV_SIZE);
if (generate_remote_report(report_data, CIPHER_PK_SIZE + CIPHER_IV_SIZE, &report, &report_size)) {
// Allocate memory on the host and copy the report over.
*remote_report = (uint8_t*)oe_host_malloc(report_size);
if (*remote_report == NULL) {
Expand Down
4 changes: 2 additions & 2 deletions host/src/c_api/c_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,8 +1459,8 @@ XGB_DLL int verify_remote_report_and_set_pubkey_and_nonce(
// Attest the remote report and accompanying key.
size_t key_and_nonce_size = key_size + nonce_size;
uint8_t key_and_nonce[key_and_nonce_size];
memcpy(key_and_nonce, pem_key, CIPHER_KEY_SIZE);
memcpy(key_and_nonce + CIPHER_KEY_SIZE, nonce, CIPHER_IV_SIZE);
memcpy(key_and_nonce, pem_key, CIPHER_PK_SIZE);
memcpy(key_and_nonce + CIPHER_PK_SIZE, nonce, CIPHER_IV_SIZE);
if (!attest_remote_report(remote_report, remote_report_size, key_and_nonce, key_and_nonce_size)) {
std::cout << "verify_report_and_set_pubkey_and_nonce failed." << std::endl;
return -1;
Expand Down