From 0e35bc9361113f127a05d2b423d76ab7197ccd3b Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 14 Sep 2024 11:13:03 +0800 Subject: [PATCH] repo-sync-2024-09-14T10:21:04+0800 (#382) --- yacl/crypto/{ossl-provider => ossl_provider}/BUILD.bazel | 0 yacl/crypto/{ossl-provider => ossl_provider}/helper.h | 2 +- .../linux_exported_syms.lds | 0 .../macos_exported_syms.lds | 0 yacl/crypto/{ossl-provider => ossl_provider}/provider.cc | 4 ++-- .../{ossl-provider => ossl_provider}/provider_test.cc | 2 +- yacl/crypto/{ossl-provider => ossl_provider}/rand_impl.h | 0 yacl/crypto/{ossl-provider => ossl_provider}/version.h | 0 yacl/crypto/rand/drbg/BUILD.bazel | 8 ++++---- yacl/crypto/rand/drbg/openssl_factory.cc | 2 +- yacl/crypto/rand/rand.cc | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename yacl/crypto/{ossl-provider => ossl_provider}/BUILD.bazel (100%) rename yacl/crypto/{ossl-provider => ossl_provider}/helper.h (97%) rename yacl/crypto/{ossl-provider => ossl_provider}/linux_exported_syms.lds (100%) rename yacl/crypto/{ossl-provider => ossl_provider}/macos_exported_syms.lds (100%) rename yacl/crypto/{ossl-provider => ossl_provider}/provider.cc (97%) rename yacl/crypto/{ossl-provider => ossl_provider}/provider_test.cc (99%) rename yacl/crypto/{ossl-provider => ossl_provider}/rand_impl.h (100%) rename yacl/crypto/{ossl-provider => ossl_provider}/version.h (100%) diff --git a/yacl/crypto/ossl-provider/BUILD.bazel b/yacl/crypto/ossl_provider/BUILD.bazel similarity index 100% rename from yacl/crypto/ossl-provider/BUILD.bazel rename to yacl/crypto/ossl_provider/BUILD.bazel diff --git a/yacl/crypto/ossl-provider/helper.h b/yacl/crypto/ossl_provider/helper.h similarity index 97% rename from yacl/crypto/ossl-provider/helper.h rename to yacl/crypto/ossl_provider/helper.h index 1857859..55af04b 100644 --- a/yacl/crypto/ossl-provider/helper.h +++ b/yacl/crypto/ossl_provider/helper.h @@ -56,7 +56,7 @@ inline std::string GetProviderPath() { std::string path1; std::string path2; std::string path3 = - fmt::format("/yacl/crypto/ossl-provider/libprov_shared{}", SO_EXT); + fmt::format("/yacl/crypto/ossl_provider/libprov_shared{}", SO_EXT); // step 1: determine if target is "cc_test" or "cc_library" if (selfdir_str.find("sandbox") != std::string::npos) { diff --git a/yacl/crypto/ossl-provider/linux_exported_syms.lds b/yacl/crypto/ossl_provider/linux_exported_syms.lds similarity index 100% rename from yacl/crypto/ossl-provider/linux_exported_syms.lds rename to yacl/crypto/ossl_provider/linux_exported_syms.lds diff --git a/yacl/crypto/ossl-provider/macos_exported_syms.lds b/yacl/crypto/ossl_provider/macos_exported_syms.lds similarity index 100% rename from yacl/crypto/ossl-provider/macos_exported_syms.lds rename to yacl/crypto/ossl_provider/macos_exported_syms.lds diff --git a/yacl/crypto/ossl-provider/provider.cc b/yacl/crypto/ossl_provider/provider.cc similarity index 97% rename from yacl/crypto/ossl-provider/provider.cc rename to yacl/crypto/ossl_provider/provider.cc index a8f87d9..99144d8 100644 --- a/yacl/crypto/ossl-provider/provider.cc +++ b/yacl/crypto/ossl_provider/provider.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "yacl/crypto/ossl-provider/rand_impl.h" -#include "yacl/crypto/ossl-provider/version.h" +#include "yacl/crypto/ossl_provider/rand_impl.h" +#include "yacl/crypto/ossl_provider/version.h" using FuncPtr = void (*)(); diff --git a/yacl/crypto/ossl-provider/provider_test.cc b/yacl/crypto/ossl_provider/provider_test.cc similarity index 99% rename from yacl/crypto/ossl-provider/provider_test.cc rename to yacl/crypto/ossl_provider/provider_test.cc index da63f55..66f59cd 100644 --- a/yacl/crypto/ossl-provider/provider_test.cc +++ b/yacl/crypto/ossl_provider/provider_test.cc @@ -24,7 +24,7 @@ #include "openssl/randerr.h" #include "yacl/crypto/openssl_wrappers.h" -#include "yacl/crypto/ossl-provider/helper.h" +#include "yacl/crypto/ossl_provider/helper.h" namespace yacl::crypto { diff --git a/yacl/crypto/ossl-provider/rand_impl.h b/yacl/crypto/ossl_provider/rand_impl.h similarity index 100% rename from yacl/crypto/ossl-provider/rand_impl.h rename to yacl/crypto/ossl_provider/rand_impl.h diff --git a/yacl/crypto/ossl-provider/version.h b/yacl/crypto/ossl_provider/version.h similarity index 100% rename from yacl/crypto/ossl-provider/version.h rename to yacl/crypto/ossl_provider/version.h diff --git a/yacl/crypto/rand/drbg/BUILD.bazel b/yacl/crypto/rand/drbg/BUILD.bazel index e4c91d3..b4f8e85 100644 --- a/yacl/crypto/rand/drbg/BUILD.bazel +++ b/yacl/crypto/rand/drbg/BUILD.bazel @@ -50,13 +50,13 @@ yacl_cc_library( "openssl_factory.h", ], data = [ - "//yacl/crypto/ossl-provider:prov_shared", # openssl provider shared lib + "//yacl/crypto/ossl_provider:prov_shared", # openssl provider shared lib ], visibility = ["//visibility:private"], deps = [ ":spi", "//yacl/crypto:openssl_wrappers", - "//yacl/crypto/ossl-provider:helper", # helper + "//yacl/crypto/ossl_provider:helper", # helper "//yacl/crypto/rand/entropy_source", ], alwayslink = 1, @@ -72,7 +72,7 @@ yacl_cc_library( "native_factory.h", ], data = [ - "//yacl/crypto/ossl-provider:prov_shared", # openssl provider shared lib + "//yacl/crypto/ossl_provider:prov_shared", # openssl provider shared lib ], visibility = ["//visibility:private"], deps = [ @@ -80,7 +80,7 @@ yacl_cc_library( "//yacl/crypto:openssl_wrappers", "//yacl/crypto/block_cipher:symmetric_crypto", "//yacl/crypto/hash:hash_utils", - "//yacl/crypto/ossl-provider:helper", # helper + "//yacl/crypto/ossl_provider:helper", # helper "//yacl/crypto/rand/entropy_source", ], alwayslink = 1, diff --git a/yacl/crypto/rand/drbg/openssl_factory.cc b/yacl/crypto/rand/drbg/openssl_factory.cc index fa507dc..aaf326c 100644 --- a/yacl/crypto/rand/drbg/openssl_factory.cc +++ b/yacl/crypto/rand/drbg/openssl_factory.cc @@ -20,7 +20,7 @@ #include #include "yacl/base/exception.h" -#include "yacl/crypto/ossl-provider/helper.h" +#include "yacl/crypto/ossl_provider/helper.h" #include "yacl/secparam.h" namespace yacl::crypto { diff --git a/yacl/crypto/rand/rand.cc b/yacl/crypto/rand/rand.cc index 3089aac..1f2bb22 100644 --- a/yacl/crypto/rand/rand.cc +++ b/yacl/crypto/rand/rand.cc @@ -19,7 +19,7 @@ #include "yacl/base/byte_container_view.h" #include "yacl/base/dynamic_bitset.h" -#include "yacl/crypto/ossl-provider/helper.h" +#include "yacl/crypto/ossl_provider/helper.h" #include "yacl/crypto/rand/entropy_source/entropy_source.h" #include "yacl/math/gadget.h"