From 95b0d063fe6439346b91ea6fa68caabf7f8ad3fd Mon Sep 17 00:00:00 2001 From: zhongtianq <141391912+zhongtianq@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:45:46 +0800 Subject: [PATCH] repo-sync-2024-06-04T20:33:48+0800 (#63) --- .bazelrc | 12 ++++------- .circleci/config.yml | 8 +++---- .github/ISSUE_TEMPLATE/issue_template.yaml | 6 +++--- REPO_LAYOUT.md | 2 +- WORKSPACE | 21 ++++++++++++------- bazel/patches/grpc.patch | 6 +++--- bazel/repositories.bzl | 7 +++---- build.sh | 8 +++---- cargo/trustedflow-attestation-rs/src/lib.rs | 2 ++ .../componentize/component/component.py | 6 ++---- .../component/eval_param_reader.py | 3 +-- dm_component/componentize/main.py | 2 ++ dm_component/deployment/Dockerfile | 6 +++--- dm_component/deployment/app_image.yaml | 6 +++--- dm_component/deployment/config_templates.yml | 6 +++--- dm_component/deployment/deploy_templates.yml | 6 +++--- docker/trustedflow-dev-ubuntu22.04.Dockerfile | 20 +++++++++--------- ...trustedflow-release-ubuntu22.04.Dockerfile | 6 +++--- docs/build.sh | 6 +++--- env.sh | 8 +++---- .../attestation/generation/csv/BUILD.bazel | 6 +++--- .../generation/csv/csv_generator.cc | 6 +++--- .../attestation/generation/sgx2/BUILD.bazel | 2 +- .../generation/sgx2/sgx2_generator.cc | 2 +- .../attestation/generation/tdx/BUILD.bazel | 2 +- .../generation/tdx/tdx_generator.cc | 2 +- .../sample/verification/wasm/.gitignore | 1 + .../verification/wasm/sample_react_app/.npmrc | 1 + .../attestation/verification/BUILD.bazel | 1 + .../attestation/verification/csv/BUILD.bazel | 5 +++-- .../verification/csv/csv_verifier.cc | 4 ++-- .../verification/interface/BUILD.bazel | 3 ++- .../verification/interface/verifier.cc | 2 +- .../attestation/verification/sgx2/BUILD.bazel | 3 ++- .../verification/sgx2/sgx2_verifier.cc | 2 +- .../attestation/verification/tdx/BUILD.bazel | 3 ++- .../verification/tdx/tdx_verifier.cc | 2 +- 37 files changed, 101 insertions(+), 93 deletions(-) diff --git a/.bazelrc b/.bazelrc index e274953..610a438 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,11 +1,11 @@ # Copyright 2023 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ common --experimental_repo_remote_exec common --experimental_cc_shared_library -build --incompatible_new_actions_api=false +build --incompatible_new_actions_api=false build --copt=-fdiagnostics-color=always build --enable_platform_specific_config build --force_pic @@ -40,10 +40,6 @@ build:macos --cxxopt -Wno-deprecated-anon-enum-enum-conversion build:macos --macos_minimum_os=11.0 build:macos --host_macos_minimum_os=11.0 -# static link libstdc++ & libgcc on Linux -build:linux --copt=-fopenmp -build:linux --action_env=BAZEL_LINKOPTS=-static-libstdc++:-static-libgcc -build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a:-l%:libgcc.a build:asan --strip=never build:asan --copt -fno-sanitize-recover=all diff --git a/.circleci/config.yml b/.circleci/config.yml index 6408f06..b40f073 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -128,7 +128,7 @@ jobs: source /root/miniconda3/etc/profile.d/conda.sh conda create -n build python=<< parameters.python_ver >> -y conda activate build - + pip install -r dev-requirements.txt # verification package diff --git a/.github/ISSUE_TEMPLATE/issue_template.yaml b/.github/ISSUE_TEMPLATE/issue_template.yaml index 0015380..b1a8c78 100644 --- a/.github/ISSUE_TEMPLATE/issue_template.yaml +++ b/.github/ISSUE_TEMPLATE/issue_template.yaml @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/REPO_LAYOUT.md b/REPO_LAYOUT.md index 01c04ba..2f47f6b 100644 --- a/REPO_LAYOUT.md +++ b/REPO_LAYOUT.md @@ -3,7 +3,7 @@ This is a high level overview of how the repository is laid out. Some major folders are listed below: * [bazel/](bazel/): Configuration for TrustedFlow's use of [Bazel](https://bazel.build/). It includes some remote repositories and rules that we use in our build system. -* [dm_component/](dm_component/): Data management component. +* [dm_component/](dm_component/): Data management component. * [docker/](docker/): Dockerfiles used to build images for compiling or running TrustedFlow. * [docs/](docs/): Documents of TrustedFlow. * [trustedflow/](trustedflow/): Some common libs used by TrustedFlow. diff --git a/WORKSPACE b/WORKSPACE index 2bd161b..e66a7da 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -18,10 +18,23 @@ load("//bazel:repositories.bzl", "trustedflow_dependencies") trustedflow_dependencies() +load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") + +grpc_deps() + +load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") + +grpc_extra_deps() + load("@yacl//bazel:repositories.bzl", "yacl_deps") yacl_deps() +# need by yacl +load("@rules_python//python:repositories.bzl", "py_repositories") + +py_repositories() + load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains") rules_proto_grpc_toolchains() @@ -32,14 +45,6 @@ load("@rules_proto_grpc//cpp:repositories.bzl", rules_proto_grpc_cpp_repos = "cp rules_proto_grpc_cpp_repos() -load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") - -grpc_deps() - -load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") - -grpc_extra_deps() - load( "@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies", diff --git a/bazel/patches/grpc.patch b/bazel/patches/grpc.patch index 004483b..875b629 100644 --- a/bazel/patches/grpc.patch +++ b/bazel/patches/grpc.patch @@ -3,17 +3,17 @@ index 0954ed54d4..0c85e99b01 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -57,12 +57,12 @@ def grpc_deps(): - + native.bind( name = "libssl", - actual = "@boringssl//:ssl", + actual = "@com_github_openssl_openssl//:openssl", ) - + native.bind( name = "libcrypto", - actual = "@boringssl//:crypto", + actual = "@com_github_openssl_openssl//:openssl", ) - + native.bind( diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 71f9ef8..f47405e 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -104,16 +104,15 @@ def _com_github_cppcodec(): sha256 = "0edaea2a9d9709d456aa99a1c3e17812ed130f9ef2b5c2d152c230a5cbc5c482", ) -# include openssl deps def _com_github_yacl(): maybe( http_archive, name = "yacl", urls = [ - "https://github.com/secretflow/yacl/archive/ea6e1ea567903804f17525fe04ede706815ece38.tar.gz", + "https://github.com/secretflow/yacl/archive/refs/tags/0.4.5b0.tar.gz", ], - strip_prefix = "yacl-ea6e1ea567903804f17525fe04ede706815ece38", - sha256 = "51c58b3c9704e439101311f74a46d97b0bc3afe2d1c53866e6a80629745cabe1", + strip_prefix = "yacl-0.4.5b0", + sha256 = "68d1dbeb255d404606d3ba9380b915fbbe3886cde575bbe89795657286742bd2", ) def _local_sgxsdk(): diff --git a/build.sh b/build.sh index 0ec5803..f55cc91 100644 --- a/build.sh +++ b/build.sh @@ -1,13 +1,13 @@ #!/bin/bash # # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,4 +15,4 @@ # limitations under the License. # -bazel --output_base=target build //trustedflow/... -c opt --repository_cache=/tmp/bazel_repo_cache --remote_download_minimal +bazel --output_base=target build //trustedflow/... -c opt --repository_cache=/tmp/bazel_repo_cache --remote_download_minimal diff --git a/cargo/trustedflow-attestation-rs/src/lib.rs b/cargo/trustedflow-attestation-rs/src/lib.rs index 688029e..66c9130 100644 --- a/cargo/trustedflow-attestation-rs/src/lib.rs +++ b/cargo/trustedflow-attestation-rs/src/lib.rs @@ -174,3 +174,5 @@ pub fn generate_attestation_report(params_json_str: &str) -> Result str: return cleantext.clean(x.strip(), lower=False, no_line_breaks=no_line_breaks) -class CompDeclError(Exception): - ... +class CompDeclError(Exception): ... -class CompEvalError(Exception): - ... +class CompEvalError(Exception): ... class CompTracer: diff --git a/dm_component/componentize/component/eval_param_reader.py b/dm_component/componentize/component/eval_param_reader.py index 3b27a78..591d588 100644 --- a/dm_component/componentize/component/eval_param_reader.py +++ b/dm_component/componentize/component/eval_param_reader.py @@ -24,8 +24,7 @@ from secretflow.spec.v1.evaluation_pb2 import NodeEvalParam -class EvalParamError(Exception): - ... +class EvalParamError(Exception): ... def check_allowed_values(value: Attribute, definition: AttributeDef): diff --git a/dm_component/componentize/main.py b/dm_component/componentize/main.py index e385d86..8c9d549 100644 --- a/dm_component/componentize/main.py +++ b/dm_component/componentize/main.py @@ -133,6 +133,7 @@ def eval_upload( # 7. upload encrypted file output_uri = reader.get_output_uri("receive_output") logging.info("##### file sending #####") + # TODO: make retry scheme configurable @retry( wait=wait_exponential(multiplier=1, min=4, max=10), @@ -301,6 +302,7 @@ def eval_data_export( # 2. download the encrytped data from sender logging.info("##### file downloading #####") + # TODO: make retry scheme configurable @retry( wait=wait_exponential(multiplier=1, min=4, max=10), diff --git a/dm_component/deployment/Dockerfile b/dm_component/deployment/Dockerfile index 83e7dec..6682e98 100644 --- a/dm_component/deployment/Dockerfile +++ b/dm_component/deployment/Dockerfile @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/dm_component/deployment/app_image.yaml b/dm_component/deployment/app_image.yaml index 6c65d8c..280a52e 100644 --- a/dm_component/deployment/app_image.yaml +++ b/dm_component/deployment/app_image.yaml @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/dm_component/deployment/config_templates.yml b/dm_component/deployment/config_templates.yml index 833d310..acbb582 100644 --- a/dm_component/deployment/config_templates.yml +++ b/dm_component/deployment/config_templates.yml @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/dm_component/deployment/deploy_templates.yml b/dm_component/deployment/deploy_templates.yml index add66a9..bb85dc1 100644 --- a/dm_component/deployment/deploy_templates.yml +++ b/dm_component/deployment/deploy_templates.yml @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docker/trustedflow-dev-ubuntu22.04.Dockerfile b/docker/trustedflow-dev-ubuntu22.04.Dockerfile index 6f10bfb..9ec6d8f 100644 --- a/docker/trustedflow-dev-ubuntu22.04.Dockerfile +++ b/docker/trustedflow-dev-ubuntu22.04.Dockerfile @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,7 @@ RUN ln -sf /usr/bin/bash /bin/sh RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y \ - tzdata \ + tzdata \ build-essential \ ocaml \ automake \ @@ -36,11 +36,11 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y \ npm \ git \ debhelper \ - zip \ + zip \ libcurl4-openssl-dev \ - pkgconf \ - libboost-dev \ - libboost-system-dev \ + pkgconf \ + libboost-dev \ + libboost-system-dev \ libboost-thread-dev \ protobuf-c-compiler \ libprotobuf-c-dev \ @@ -54,7 +54,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y \ rsync \ libfuse2 \ && rm -f /etc/ssh/ssh_host_* \ - && apt clean + && apt clean # instal protoc v3.19.4 RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip \ @@ -69,7 +69,7 @@ RUN wget http://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \ && conda init -# install bazelisk +# install bazelisk RUN npm install -g @bazel/bazelisk # install emsdk diff --git a/docker/trustedflow-release-ubuntu22.04.Dockerfile b/docker/trustedflow-release-ubuntu22.04.Dockerfile index 10e7c38..eafc5e0 100644 --- a/docker/trustedflow-release-ubuntu22.04.Dockerfile +++ b/docker/trustedflow-release-ubuntu22.04.Dockerfile @@ -1,11 +1,11 @@ # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/build.sh b/docs/build.sh index 787f80e..3a73c5a 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -1,13 +1,13 @@ #!/bin/bash # # Copyright 2024 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/env.sh b/env.sh index 7c758b4..34ee409 100755 --- a/env.sh +++ b/env.sh @@ -1,13 +1,13 @@ #!/bin/bash # # Copyright 2023 Ant Group Co., Ltd. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,5 +31,5 @@ else --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \ --cap-add=NET_ADMIN \ --privileged=true \ - ${image} + ${image} fi diff --git a/trustedflow/attestation/generation/csv/BUILD.bazel b/trustedflow/attestation/generation/csv/BUILD.bazel index 9d04f7e..993cc8d 100644 --- a/trustedflow/attestation/generation/csv/BUILD.bazel +++ b/trustedflow/attestation/generation/csv/BUILD.bazel @@ -29,9 +29,9 @@ trustedflow_cc_library( "@cppcodec", "@trustedflow//:hygon_csv_header", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", - "@yacl//yacl/crypto/base/hmac:hmac_sm3", - "@yacl//yacl/crypto/utils:rand", + "@yacl//yacl/crypto/hash:hash_utils", + "@yacl//yacl/crypto/hmac:hmac_sm3", + "@yacl//yacl/crypto/rand", "@yacl//yacl/utils:scope_guard", ], ) diff --git a/trustedflow/attestation/generation/csv/csv_generator.cc b/trustedflow/attestation/generation/csv/csv_generator.cc index a6d7227..63f53c2 100644 --- a/trustedflow/attestation/generation/csv/csv_generator.cc +++ b/trustedflow/attestation/generation/csv/csv_generator.cc @@ -26,9 +26,9 @@ #include "csv/attestation/attestation.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" -#include "yacl/crypto/base/hmac/hmac_sm3.h" -#include "yacl/crypto/utils/rand.h" +#include "yacl/crypto/hash/hash_utils.h" +#include "yacl/crypto/hmac/hmac_sm3.h" +#include "yacl/crypto/rand/rand.h" #include "yacl/utils/scope_guard.h" #include "trustedflow/attestation/collateral/hygon_collateral.h" diff --git a/trustedflow/attestation/generation/sgx2/BUILD.bazel b/trustedflow/attestation/generation/sgx2/BUILD.bazel index 570b65c..f6b05e9 100644 --- a/trustedflow/attestation/generation/sgx2/BUILD.bazel +++ b/trustedflow/attestation/generation/sgx2/BUILD.bazel @@ -29,7 +29,7 @@ trustedflow_cc_library( "@cppcodec", "@dcap//:sgx_dcap_quoteverify", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/utils:scope_guard", ], ) diff --git a/trustedflow/attestation/generation/sgx2/sgx2_generator.cc b/trustedflow/attestation/generation/sgx2/sgx2_generator.cc index 7152d2a..9541de2 100644 --- a/trustedflow/attestation/generation/sgx2/sgx2_generator.cc +++ b/trustedflow/attestation/generation/sgx2/sgx2_generator.cc @@ -30,7 +30,7 @@ #include "sgx_report.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "yacl/utils/scope_guard.h" #include "trustedflow/attestation/collateral/intel_collateral.h" diff --git a/trustedflow/attestation/generation/tdx/BUILD.bazel b/trustedflow/attestation/generation/tdx/BUILD.bazel index fed29d3..b450a7e 100644 --- a/trustedflow/attestation/generation/tdx/BUILD.bazel +++ b/trustedflow/attestation/generation/tdx/BUILD.bazel @@ -29,6 +29,6 @@ trustedflow_cc_library( "@dcap//:sgx_dcap_quoteverify", "@dcap//:tdx_attest", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base/hash:hash_utils", + "@yacl//yacl/crypto/hash:hash_utils", ], ) diff --git a/trustedflow/attestation/generation/tdx/tdx_generator.cc b/trustedflow/attestation/generation/tdx/tdx_generator.cc index 1ce3617..7fc0664 100644 --- a/trustedflow/attestation/generation/tdx/tdx_generator.cc +++ b/trustedflow/attestation/generation/tdx/tdx_generator.cc @@ -27,7 +27,7 @@ #include "spdlog/spdlog.h" #include "tdx_attest.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/hash_utils.h" +#include "yacl/crypto/hash/hash_utils.h" #include "trustedflow/attestation/collateral/intel_collateral.h" #include "trustedflow/attestation/common/constants.h" diff --git a/trustedflow/attestation/sample/verification/wasm/.gitignore b/trustedflow/attestation/sample/verification/wasm/.gitignore index e69de29..8b13789 100644 --- a/trustedflow/attestation/sample/verification/wasm/.gitignore +++ b/trustedflow/attestation/sample/verification/wasm/.gitignore @@ -0,0 +1 @@ + diff --git a/trustedflow/attestation/sample/verification/wasm/sample_react_app/.npmrc b/trustedflow/attestation/sample/verification/wasm/sample_react_app/.npmrc index 5e4086a..8f46dd2 100644 --- a/trustedflow/attestation/sample/verification/wasm/sample_react_app/.npmrc +++ b/trustedflow/attestation/sample/verification/wasm/sample_react_app/.npmrc @@ -1 +1,2 @@ registry=https://registry.npmmirror.com/ + diff --git a/trustedflow/attestation/verification/BUILD.bazel b/trustedflow/attestation/verification/BUILD.bazel index cf85b49..4dac8ad 100644 --- a/trustedflow/attestation/verification/BUILD.bazel +++ b/trustedflow/attestation/verification/BUILD.bazel @@ -23,3 +23,4 @@ cc_library( "//trustedflow/attestation/verification/tdx:tdx_verifier", ], ) + diff --git a/trustedflow/attestation/verification/csv/BUILD.bazel b/trustedflow/attestation/verification/csv/BUILD.bazel index ad9c8c6..acf4431 100644 --- a/trustedflow/attestation/verification/csv/BUILD.bazel +++ b/trustedflow/attestation/verification/csv/BUILD.bazel @@ -29,7 +29,8 @@ trustedflow_cc_library( "@sf_apis//:cc_sf_apis_proto", "@trustedflow//:hygon_csv_header", "@yacl//yacl/base:exception", - "@yacl//yacl/crypto/base:openssl_wrappers", - "@yacl//yacl/crypto/base/sign:sm2_signing", + "@yacl//yacl/crypto:openssl_wrappers", + "@yacl//yacl/crypto/sign:sm2_signing", ], ) + diff --git a/trustedflow/attestation/verification/csv/csv_verifier.cc b/trustedflow/attestation/verification/csv/csv_verifier.cc index 644ca54..956e3d1 100644 --- a/trustedflow/attestation/verification/csv/csv_verifier.cc +++ b/trustedflow/attestation/verification/csv/csv_verifier.cc @@ -21,8 +21,8 @@ #include "openssl/params.h" #include "spdlog/spdlog.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/openssl_wrappers.h" -#include "yacl/crypto/base/sign/sm2_signing.h" +#include "yacl/crypto/openssl_wrappers.h" +#include "yacl/crypto/sign/sm2_signing.h" #include "trustedflow/attestation/common/constants.h" #include "trustedflow/attestation/utils/json2pb.h" diff --git a/trustedflow/attestation/verification/interface/BUILD.bazel b/trustedflow/attestation/verification/interface/BUILD.bazel index 6ff981f..6f8c168 100644 --- a/trustedflow/attestation/verification/interface/BUILD.bazel +++ b/trustedflow/attestation/verification/interface/BUILD.bazel @@ -21,6 +21,7 @@ cc_library( deps = [ "//trustedflow/attestation/utils:json2pb", "@sf_apis//:cc_sf_apis_proto", - "@yacl//yacl/crypto/base/hash:ssl_hash", + "@yacl//yacl/crypto/hash:ssl_hash", ], ) + diff --git a/trustedflow/attestation/verification/interface/verifier.cc b/trustedflow/attestation/verification/interface/verifier.cc index fa71818..8e5d169 100644 --- a/trustedflow/attestation/verification/interface/verifier.cc +++ b/trustedflow/attestation/verification/interface/verifier.cc @@ -16,7 +16,7 @@ #include "absl/strings/escaping.h" #include "absl/strings/match.h" -#include "yacl/crypto/base/hash/ssl_hash.h" +#include "yacl/crypto/hash/ssl_hash.h" namespace trustedflow { namespace attestation { diff --git a/trustedflow/attestation/verification/sgx2/BUILD.bazel b/trustedflow/attestation/verification/sgx2/BUILD.bazel index 3015142..5370463 100644 --- a/trustedflow/attestation/verification/sgx2/BUILD.bazel +++ b/trustedflow/attestation/verification/sgx2/BUILD.bazel @@ -23,6 +23,7 @@ cc_library( "//trustedflow/attestation/verification/interface:verifier", "@cppcodec", "@dcap//:sgx_dcap_quoteverify", - "@yacl//yacl/crypto/base/hash:ssl_hash", + "@yacl//yacl/crypto/hash:ssl_hash", ], ) + diff --git a/trustedflow/attestation/verification/sgx2/sgx2_verifier.cc b/trustedflow/attestation/verification/sgx2/sgx2_verifier.cc index 9c8f494..f44f202 100644 --- a/trustedflow/attestation/verification/sgx2/sgx2_verifier.cc +++ b/trustedflow/attestation/verification/sgx2/sgx2_verifier.cc @@ -20,7 +20,7 @@ #include "sgx_quote_3.h" #include "yacl/base/byte_container_view.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/ssl_hash.h" +#include "yacl/crypto/hash/ssl_hash.h" #include "trustedflow/attestation/common/constants.h" #include "trustedflow/attestation/utils/json2pb.h" diff --git a/trustedflow/attestation/verification/tdx/BUILD.bazel b/trustedflow/attestation/verification/tdx/BUILD.bazel index d85d9a4..8b98af8 100644 --- a/trustedflow/attestation/verification/tdx/BUILD.bazel +++ b/trustedflow/attestation/verification/tdx/BUILD.bazel @@ -23,6 +23,7 @@ cc_library( "//trustedflow/attestation/verification/interface:verifier", "@cppcodec", "@dcap//:sgx_dcap_quoteverify", - "@yacl//yacl/crypto/base/hash:ssl_hash", + "@yacl//yacl/crypto/hash:ssl_hash", ], ) + diff --git a/trustedflow/attestation/verification/tdx/tdx_verifier.cc b/trustedflow/attestation/verification/tdx/tdx_verifier.cc index 72c049b..163bb11 100644 --- a/trustedflow/attestation/verification/tdx/tdx_verifier.cc +++ b/trustedflow/attestation/verification/tdx/tdx_verifier.cc @@ -21,7 +21,7 @@ #include "sgx_quote_5.h" #include "yacl/base/byte_container_view.h" #include "yacl/base/exception.h" -#include "yacl/crypto/base/hash/ssl_hash.h" +#include "yacl/crypto/hash/ssl_hash.h" #include "trustedflow/attestation/common/constants.h" #include "trustedflow/attestation/utils/json2pb.h"