Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9f71461
add remote attestation test inside UEFI app
Apr 11, 2022
fb4f905
Stub missing symbols
Apr 11, 2022
c4b2bea
improve comment spelling somewhat
Apr 11, 2022
63c22a9
Use ___chkstk_ms from go
Apr 11, 2022
8c49af0
simplify test to aid debugging: just test ring source of randomness
Apr 11, 2022
d73e848
log random data in test
Apr 12, 2022
d8111c8
patch rdrand availability check for debuggingnd enable KVM
Apr 13, 2022
b20fe50
Merge branch 'main' into uefi-test-remote-attestation
Apr 14, 2022
837660c
Add test to check that the byte array has in fact been filled
Apr 14, 2022
3227a63
add remote attestation handshake test
Apr 14, 2022
d2009a3
Update config to match #2725
Apr 14, 2022
d8de7d6
Remoe test of ring, as remote attestation is now tested
Apr 14, 2022
7a94c05
remove debugging logs from remote attestation test
Apr 14, 2022
2779e2a
wip
Apr 14, 2022
e69748c
Merge branch 'main' into uefi-test-remote-attestation
Apr 14, 2022
17960fd
Revert "wip"
Apr 14, 2022
b458198
Move the UEFI remote attestation test into it's own module
Apr 14, 2022
9d43182
remove now unneeded crate imports in the main UEFI app
Apr 14, 2022
2e0bc9a
finalize moving remote attestation test
Apr 14, 2022
7f0889b
redundant surplus qemu cpu flags
Apr 14, 2022
7bb2381
Add anyhow as dev dep for test
Apr 14, 2022
56e0e25
Add extra context to ring stubs
Apr 14, 2022
6f66c52
Only run remote attestation tests if the hosts supports kvm, and the …
Apr 14, 2022
ca2cea7
improve comment for clarity
Apr 14, 2022
0c424d5
improve comment copy
Apr 14, 2022
8f1e760
Merge branch 'main' into uefi-test-remote-attestation
Apr 14, 2022
8d258a5
disable ring default features to fix duplicate lang items
Apr 14, 2022
26082d0
bust CI cache
Apr 14, 2022
eebf47c
toggle tests that require kvm by disabling a default flag, as xtask e…
Apr 14, 2022
6c27bf0
Clarify comment
Apr 14, 2022
23a3508
Improve comments for accuracy and clarity
Apr 19, 2022
9e03123
Don't lint target subdirectories created by cargo fuzz
Apr 19, 2022
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
1 change: 1 addition & 0 deletions experimental/uefi/app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions experimental/uefi/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ uefi = { version = "*", features = ["exts"] }
uefi-services = "*"
log = { version = "*" }
oak_remote_attestation = { path = "../../../remote_attestation/rust" }
anyhow = { version = "*", default-features = false }

[dev-dependencies]
uefi-services = { version = "*", features = ["qemu"] }
87 changes: 87 additions & 0 deletions experimental/uefi/app/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@

#[macro_use]
extern crate log;
extern crate alloc;
extern crate anyhow;

#[cfg(test)]
use alloc::{boxed::Box, sync::Arc};
#[cfg(test)]
use oak_remote_attestation::handshaker::{AttestationBehavior, ClientHandshaker, ServerHandshaker};
use uefi::{
prelude::*,
proto::console::serial::Serial,
Expand Down Expand Up @@ -130,3 +136,84 @@ fn test_simple() {
let x = 1;
assert_eq!(x, 1);
}

#[cfg(test)]
const TEE_MEASUREMENT: &str = "Test TEE measurement";
#[cfg(test)]
const DATA: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];

#[cfg(test)]
fn create_handshakers() -> (ClientHandshaker, ServerHandshaker) {
let bidirectional_attestation =
AttestationBehavior::create_bidirectional_attestation(&[], TEE_MEASUREMENT.as_bytes())
.unwrap();
let client_handshaker = ClientHandshaker::new(
bidirectional_attestation,
Box::new(|server_identity| {
if !server_identity.additional_info.is_empty() {
Ok(())
} else {
anyhow::bail!("No additional info provided.")
}
}),
);

let bidirectional_attestation =
AttestationBehavior::create_bidirectional_attestation(&[], TEE_MEASUREMENT.as_bytes())
.unwrap();

let additional_info = br"Additional Info".to_vec();
let server_handshaker =
ServerHandshaker::new(bidirectional_attestation, Arc::new(additional_info));

(client_handshaker, server_handshaker)
}

#[test_case]
fn test_handshake() {
let (mut client_handshaker, mut server_handshaker) = create_handshakers();

let client_hello = client_handshaker
.create_client_hello()
.expect("Couldn't create client hello message");

let server_identity = server_handshaker
.next_step(&client_hello)
.expect("Couldn't process client hello message")
.expect("Empty server identity message");

let client_identity = client_handshaker
.next_step(&server_identity)
.expect("Couldn't process server identity message")
.expect("Empty client identity message");
assert!(client_handshaker.is_completed());

let result = server_handshaker
.next_step(&client_identity)
.expect("Couldn't process client identity message");
assert_eq!(result, None);
assert!(server_handshaker.is_completed());

let mut client_encryptor = client_handshaker
.get_encryptor()
.expect("Couldn't get client encryptor");
let mut server_encryptor = server_handshaker
.get_encryptor()
.expect("Couldn't get server encryptor");

let encrypted_client_data = client_encryptor
.encrypt(&DATA)
.expect("Couldn't encrypt client data");
let decrypted_client_data = server_encryptor
.decrypt(&encrypted_client_data)
.expect("Couldn't decrypt client data");
assert_eq!(decrypted_client_data, DATA);

let encrypted_server_data = server_encryptor
.encrypt(&DATA)
.expect("Couldn't encrypt server data");
let decrypted_server_data = client_encryptor
.decrypt(&encrypted_server_data)
.expect("Couldn't decrypt server data");
assert_eq!(decrypted_server_data, DATA);
}
2 changes: 2 additions & 0 deletions third_party/ring/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ include = [
"benches/*.rs",
"build.rs",

"stubs.c",

"crypto/chacha/asm/chacha-armv4.pl",
"crypto/chacha/asm/chacha-armv8.pl",
"crypto/chacha/asm/chacha-x86.pl",
Expand Down
1 change: 1 addition & 0 deletions third_party/ring/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const RING_SRCS: &[(&[&str], &str)] = &[
(&[X86], "crypto/chacha/asm/chacha-x86.pl"),
(&[X86], "crypto/fipsmodule/modes/asm/ghash-x86.pl"),

(&[X86_64], "stubs.c"),
(&[X86_64], "crypto/chacha/asm/chacha-x86_64.pl"),
(&[X86_64], "crypto/fipsmodule/aes/asm/aesni-x86_64.pl"),
(&[X86_64], "crypto/fipsmodule/aes/asm/vpaes-x86_64.pl"),
Expand Down
30 changes: 30 additions & 0 deletions third_party/ring/stubs.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include <stddef.h>

/**
*
Stub function for win64 error handler API call inserted by nasm.
Stubbed as it unavailable in UEFI.
Ref: https://github.com/openssl/openssl/issues/12712.
Inspired by: https://github.com/tianocore/edk2/blob/7c0ad2c33810ead45b7919f8f8d0e282dae52e71/CryptoPkg/Library/OpensslLib/X64/ApiHooks.c
**/
void *
__imp_RtlVirtualUnwind (
void *Args
)
{
return NULL;
}

/**
Stub function for win64 routine used for exceedomgy large variable calls.
Inserted MinGW, stubbed as it unavailable in UEFI.
Ref: https://metricpanda.com/rival-fortress-update-45-dealing-with-__chkstk-__chkstk_ms-when-cross-compiling-for-windows/
**/
void *
Copy link
Collaborator

@conradgrobler conradgrobler Apr 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about this a bit more, I don't think this is the correct signature. I think it should be a naked function (not sure how to do that in c, but in rust it is marked with a [naked] attribute to stop the compiler from emitting a function prologue or epilogue) with no arguments and no return values.

Perhaps something like the following might work:

__attribute__((naked)) void ___chkstk_ms() {
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, will look into it

Copy link
Author

@jul-sh jul-sh Apr 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current status is that with those two stubs (as currently present), it does build. However it panics as soon as the underlying crypto code is called:

[ERROR]: /home/docker/.cargo/registry/src/github.com-1ecc6299db9ec823/uefi-services-0.12.1/src/lib.rs@142: Panic in src/main.rs at (149, 14):
[ERROR]: /home/docker/.cargo/registry/src/github.com-1ecc6299db9ec823/uefi-services-0.12.1/src/lib.rs@149: called `Result::unwrap()` on an `Err` value: Couldn't create signer
ERROR: 
ERROR: Caused by:
[ERROR]: /home/docker/.cargo/registry/src/github.com-1ecc6299db9ec823/uefi-services-0.12.1/src/lib.rs@149:     Couldn't generate PKCS#8 key pair: Unspecified

A simpler test (just filling a buf with SystemRandom to start with) results in the same panic.

Copy link
Author

@jul-sh jul-sh Apr 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the current stub should be fine, very similar to the stub that go used for a while:
https://android.googlesource.com/platform/external/compiler-rt/+/ccaafe6%5E%21/#F1
ref discussion in golang/go#6305

___chkstk_ms (
void *Args
)
{
return NULL;
}