From c2d1274cacb4b3431046b972072fca2a829aff9a Mon Sep 17 00:00:00 2001 From: Valentyn Faychuk Date: Sat, 24 Aug 2024 06:25:06 +0200 Subject: [PATCH] fixed MRENCLAVE and scripts --- README.md | 6 +++++- build_client.sh | 2 +- build_server.sh | 2 +- examples/mratls_grpcs_client.rs | 2 +- examples/mratls_grpcs_server.rs | 2 +- examples/mratls_https_client.rs | 2 +- examples/mratls_https_server.rs | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e56f2e1..64c23d0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The MRSIGNER of the `example/signing_key.pem` is hardcoded in the enclave code: ``` -6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC +83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76 ``` You can generate your own signing key. Just use the following command: @@ -17,6 +17,10 @@ and use the following command: ``` ./mrsigner signing_key.pem +# For the example/signing_key.pem the output is: +6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC +# FIXME: Which is different from the real MRSIGNER by Occlum: +83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76 ``` ## Running Examples diff --git a/build_client.sh b/build_client.sh index 73eb678..364808a 100755 --- a/build_client.sh +++ b/build_client.sh @@ -30,4 +30,4 @@ copy_bom -f ../client.yaml --root image --include-dir /opt/occlum/etc/template occlum build --sign-key ../examples/signing_key.pem --enable-edmm Y occlum package --debug client.tar.gz -occlum run /bin/client +occlum run /bin/mratls_${EXAMPLE}_client diff --git a/build_server.sh b/build_server.sh index abd553f..0481be1 100755 --- a/build_server.sh +++ b/build_server.sh @@ -30,4 +30,4 @@ copy_bom -f ../server.yaml --root image --include-dir /opt/occlum/etc/template occlum build --sign-key ../examples/signing_key.pem --enable-edmm Y occlum package --debug server.tar.gz -occlum run /bin/server +occlum run /bin/mratls_${EXAMPLE}_server diff --git a/examples/mratls_grpcs_client.rs b/examples/mratls_grpcs_client.rs index 50d4eda..6ee1554 100644 --- a/examples/mratls_grpcs_client.rs +++ b/examples/mratls_grpcs_client.rs @@ -14,7 +14,7 @@ use tokio_rustls::rustls::ClientConfig; async fn main() -> Result<(), Box> { env_logger::init_from_env(env_logger::Env::default().default_filter_or("trace")); - let mrsigner_hex = "6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC"; + let mrsigner_hex = "83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76"; let mut mrsigner = [0u8; 32]; hex::decode_to_slice(mrsigner_hex, &mut mrsigner).expect("mrsigner decoding failed"); diff --git a/examples/mratls_grpcs_server.rs b/examples/mratls_grpcs_server.rs index 71622dd..b44d955 100644 --- a/examples/mratls_grpcs_server.rs +++ b/examples/mratls_grpcs_server.rs @@ -25,7 +25,7 @@ use occlum_ratls::RaTlsConfigBuilder; async fn main() -> Result<(), Box> { env_logger::init_from_env(env_logger::Env::default().default_filter_or("trace")); - let mrsigner_hex = "6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC"; + let mrsigner_hex = "83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76"; let mut mrsigner = [0u8; 32]; hex::decode_to_slice(mrsigner_hex, &mut mrsigner).expect("mrsigner decoding failed"); diff --git a/examples/mratls_https_client.rs b/examples/mratls_https_client.rs index 7dfbd20..532df8a 100644 --- a/examples/mratls_https_client.rs +++ b/examples/mratls_https_client.rs @@ -5,7 +5,7 @@ use reqwest::ClientBuilder; async fn main() -> Result<(), Box> { env_logger::init_from_env(env_logger::Env::default().default_filter_or("trace")); - let mrsigner_hex = "6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC"; + let mrsigner_hex = "83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76"; let mut mrsigner = [0u8; 32]; hex::decode_to_slice(mrsigner_hex, &mut mrsigner)?; diff --git a/examples/mratls_https_server.rs b/examples/mratls_https_server.rs index e837bce..e03bde7 100644 --- a/examples/mratls_https_server.rs +++ b/examples/mratls_https_server.rs @@ -11,7 +11,7 @@ async fn index() -> String { async fn main() -> Result<(), Box> { env_logger::init_from_env(env_logger::Env::default().default_filter_or("trace")); - let mrsigner_hex = "6871A831CED408CD99F0ED31587CC2B5C728C99D4A0A1ADF2F0C5574EBBB00DC"; + let mrsigner_hex = "83E8A0C3ED045D9747ADE06C3BFC70FCA661A4A65FF79A800223621162A88B76"; let mut mrsigner = [0u8; 32]; hex::decode_to_slice(mrsigner_hex, &mut mrsigner)?;