diff --git a/demos/ra_tls/build_occlum_instance.sh b/demos/ra_tls/build_occlum_instance.sh index dde415be..06d7464f 100755 --- a/demos/ra_tls/build_occlum_instance.sh +++ b/demos/ra_tls/build_occlum_instance.sh @@ -2,12 +2,7 @@ set -e function get_mr() { - sgx_sign dump -enclave ../occlum_$1/build/lib/libocclum-libos.signed.so -dumpfile ../metadata_info_$1.txt - if [ "$2" == "mr_enclave" ]; then - sed -n -e '/enclave_hash.m/,/metadata->enclave_css.body.isv_prod_id/p' ../metadata_info_$1.txt |head -3|tail -2|xargs|sed 's/0x//g'|sed 's/ //g' - elif [ "$2" == "mr_signer" ]; then - tail -2 ../metadata_info_$1.txt |xargs|sed 's/0x//g'|sed 's/ //g' - fi + cd ${script_dir}/occlum_$1 && occlum print $2 } function build_instance() { @@ -28,8 +23,8 @@ function build_instance() { .verify_isv_svn = "off" | .verify_config_svn = "off" | .verify_enclave_debuggable = "on" | - .sgx_mrs[0].mr_enclave = ''"'`get_mr client mr_enclave`'" | - .sgx_mrs[0].mr_signer = ''"'`get_mr client mr_signer`'" | + .sgx_mrs[0].mr_enclave = ''"'`get_mr client mrenclave`'" | + .sgx_mrs[0].mr_signer = ''"'`get_mr client mrsigner`'" | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json if [ "$libnss_require" == "y" ]; then diff --git a/demos/remote_attestation/init_ra_flow/build_content.sh b/demos/remote_attestation/init_ra_flow/build_content.sh index 6a73abcb..f6987687 100755 --- a/demos/remote_attestation/init_ra_flow/build_content.sh +++ b/demos/remote_attestation/init_ra_flow/build_content.sh @@ -68,7 +68,7 @@ function build_client_instance() .verify_isv_svn = "off" | .verify_config_svn = "off" | .verify_enclave_debuggable = "on" | - .sgx_mrs[0].mr_signer = ''"'`get_mr client mr_signer`'" | + .sgx_mrs[0].mr_signer = ''"'`get_mr client mrsigner`'" | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json # prepare init-ra content @@ -81,12 +81,7 @@ function build_client_instance() } function get_mr() { - sgx_sign dump -enclave ${script_dir}/occlum_$1/build/lib/libocclum-libos.signed.so -dumpfile ../metadata_info_$1.txt - if [ "$2" == "mr_enclave" ]; then - sed -n -e '/enclave_hash.m/,/metadata->enclave_css.body.isv_prod_id/p' ../metadata_info_$1.txt |head -3|tail -2|xargs|sed 's/0x//g'|sed 's/ //g' - elif [ "$2" == "mr_signer" ]; then - tail -2 ../metadata_info_$1.txt |xargs|sed 's/0x//g'|sed 's/ //g' - fi + cd ${script_dir}/occlum_$1 && occlum print $2 } function gen_secret_json() { @@ -115,8 +110,8 @@ function build_server_instance() .verify_isv_svn = "on" | .verify_config_svn = "on" | .verify_enclave_debuggable = "on" | - .sgx_mrs[0].mr_enclave = ''"'`get_mr client mr_enclave`'" | - .sgx_mrs[0].mr_signer = ''"'`get_mr client mr_signer`'" | + .sgx_mrs[0].mr_enclave = ''"'`get_mr client mrenclave`'" | + .sgx_mrs[0].mr_signer = ''"'`get_mr client mrsigner`'" | .sgx_mrs[0].isv_svn = 88 | .sgx_mrs[0].config_svn = 1234 | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json diff --git a/example/build_content.sh b/example/build_content.sh index 88f3cff7..b661f51c 100755 --- a/example/build_content.sh +++ b/example/build_content.sh @@ -73,7 +73,7 @@ function build_tf_instance() .verify_isv_svn = "off" | .verify_config_svn = "off" | .verify_enclave_debuggable = "on" | - .sgx_mrs[0].mr_signer = ''"'`get_mr tf mr_signer`'" | + .sgx_mrs[0].mr_signer = ''"'`get_mr tf mrsigner`'" | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json # prepare init-ra content @@ -87,12 +87,7 @@ function build_tf_instance() } function get_mr() { - sgx_sign dump -enclave ${script_dir}/occlum_$1/build/lib/libocclum-libos.signed.so -dumpfile ../metadata_info_$1.txt - if [ "$2" == "mr_enclave" ]; then - sed -n -e '/enclave_hash.m/,/metadata->enclave_css.body.isv_prod_id/p' ../metadata_info_$1.txt |head -3|tail -2|xargs|sed 's/0x//g'|sed 's/ //g' - elif [ "$2" == "mr_signer" ]; then - tail -2 ../metadata_info_$1.txt |xargs|sed 's/0x//g'|sed 's/ //g' - fi + cd ${script_dir}/occlum_$1 && occlum print $2 } function gen_secret_json() { @@ -120,8 +115,8 @@ function build_server_instance() .verify_isv_svn = "off" | .verify_config_svn = "off" | .verify_enclave_debuggable = "on" | - .sgx_mrs[0].mr_enclave = ''"'`get_mr tf mr_enclave`'" | - .sgx_mrs[0].mr_signer = ''"'`get_mr tf mr_signer`'" | + .sgx_mrs[0].mr_enclave = ''"'`get_mr tf mrenclave`'" | + .sgx_mrs[0].mr_signer = ''"'`get_mr tf mrsigner`'" | .sgx_mrs[0].debuggable = false ' ../ra_config_template.json > dynamic_config.json new_json="$(jq '.resource_limits.user_space_size = "500MB" |