Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
* Make script PDO_LOG_LEVEL aware
* Remove unnecessary env check which leads to misleading ERROR messages
  when running no-config docker

Signed-off-by: Michael Steiner <[email protected]>
  • Loading branch information
Michael Steiner committed Apr 9, 2024
1 parent df642d9 commit c343c7a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion common/crypto/verify_ias_report/fetch_ias_certificates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
# -----------------------------------------------------------------
# -----------------------------------------------------------------
source ${PDO_SOURCE_ROOT}/bin/lib/common.sh
check_pdo_build_env

IAS_CERTIFICATE_URL=$1

Expand Down
6 changes: 3 additions & 3 deletions eservice/bin/register-with-ledger.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ function Store {
yell PDO_FORCE_IAS_PROXY is true
NO_PROXY='' no_proxy='' try eservice-enclave-info \
--save ${eservice_enclave_info_file} \
--loglevel info \
--loglevel ${PDO_LOG_LEVEL} \
--logfile __screen__ \
--identity ${ESERVICE_IDENTITY} \
--config ${ESERVICE_TOML} \
--config-dir ${ETCDIR}
else
try eservice-enclave-info \
--save ${eservice_enclave_info_file} \
--loglevel info \
--loglevel ${PDO_LOG_LEVEL} \
--logfile __screen__ \
--identity ${ESERVICE_IDENTITY} \
--config ${ESERVICE_TOML} \
Expand All @@ -86,7 +86,7 @@ function Register {
yell Register enclave with CCF ledger: mrenclave=${VAR_MRENCLAVE} basename=${VAR_BASENAME}
source ${PDO_INSTALL_ROOT}/bin/activate
try ${PDO_INSTALL_ROOT}/bin/ccf_set_expected_sgx_measurements \
--logfile __screen__ --loglevel INFO --mrenclave ${VAR_MRENCLAVE} \
--logfile __screen__ --loglevel ${PDO_LOG_LEVEL} --mrenclave ${VAR_MRENCLAVE} \
--basename ${VAR_BASENAME} --ias-public-key "$(cat $IAS_KEY_PEM)"
else
die unsupported ledger ${PDO_LEDGER_TYPE}
Expand Down

0 comments on commit c343c7a

Please sign in to comment.