From 79d5eb678afe233cf7a39342ce75efeb7296cdab Mon Sep 17 00:00:00 2001 From: code4lala Date: Wed, 1 Mar 2023 11:11:22 +0800 Subject: [PATCH] format gn Signed-off-by: code4lala Change-Id: Ie496270d939f787d14670a7851dbde783b6a4335 --- BUILD.gn | 262 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 139 insertions(+), 123 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 7c818b791f..d222c80e4c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -20,14 +20,17 @@ openssl_internal_cflags = [ # err = strerror_r(errnum, buf, buflen); # ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "-Wno-error=int-conversion", + # ../../third_party/openssl/crypto/bn/bn_conv.c:92:34: error: implicit conversion from 'unsigned long long' to 'unsigned long' changes value from 10000000000000000000 to 2313682944 [-Werror,-Wconstant-conversion] # *lp = BN_div_word(t, BN_DEC_CONV); # ~~~~~~~~~~~ ^~~~~~~~~~~ "-Wno-error=constant-conversion", + # ../../third_party/openssl/crypto/bn/bn_exp.c:382:38: error: shift count >= width of type [-Werror,-Wshift-count-overflow] # if (m->d[j - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) { # ^ ~~~~~~~~~~~~~~ "-Wno-error=shift-count-overflow", + # ../../third_party/openssl/crypto/conf/conf_def.c:31:11: error: 'stat' macro redefined [-Werror,-Wmacro-redefined] # # define stat _stat # ^ @@ -74,7 +77,8 @@ crypto_config_linux_armv4_private_include_dirs = [ "build_all_generated/linux-armv4/providers/common/include", "build_all_generated/linux-armv4/providers/common/include/prov", ] -crypto_config_linux_armv4_public_include_dirs = [ "build_all_generated/linux-armv4/include" ] +crypto_config_linux_armv4_public_include_dirs = + [ "build_all_generated/linux-armv4/include" ] crypto_config_linux_armv4_cflags = [ "-DOPENSSL_USE_NODELETE", @@ -103,7 +107,8 @@ crypto_config_linux_aarch64_private_include_dirs = [ "build_all_generated/linux-aarch64/providers/common/include", "build_all_generated/linux-aarch64/providers/common/include/prov", ] -crypto_config_linux_aarch64_public_include_dirs = [ "build_all_generated/linux-aarch64/include" ] +crypto_config_linux_aarch64_public_include_dirs = + [ "build_all_generated/linux-aarch64/include" ] crypto_config_linux_aarch64_cflags = [ "-DOPENSSL_USE_NODELETE", @@ -129,7 +134,8 @@ crypto_config_linux_x86_64_private_include_dirs = [ "build_all_generated/linux-x86_64/providers/common/include", "build_all_generated/linux-x86_64/providers/common/include/prov", ] -crypto_config_linux_x86_64_public_include_dirs = [ "build_all_generated/linux-x86_64/include" ] +crypto_config_linux_x86_64_public_include_dirs = + [ "build_all_generated/linux-x86_64/include" ] crypto_config_linux_x86_64_cflags = [ "-DL_ENDIAN", @@ -167,7 +173,8 @@ crypto_config_mingw64_private_include_dirs = [ "build_all_generated/mingw64/providers/common/include", "build_all_generated/mingw64/providers/common/include/prov", ] -crypto_config_mingw64_public_include_dirs = [ "build_all_generated/mingw64/include" ] +crypto_config_mingw64_public_include_dirs = + [ "build_all_generated/mingw64/include" ] crypto_config_mingw64_cflags = [ "-D_MT", @@ -197,7 +204,6 @@ crypto_config_mingw64_cflags = [ "-DX25519_ASM", ] - print("openssl detecting os now...") print("current_cpu = ${current_cpu}") print("current_os = ${current_os}") @@ -207,35 +213,46 @@ crypto_config_current_platform_public_include_dirs = [] crypto_config_current_platform_cflags = [] if (current_cpu == "arm" && !(current_os == "linux" || host_os == "mac")) { print("openssl selected linux-armv4") - crypto_config_current_platform_private_include_dirs += crypto_config_linux_armv4_private_include_dirs - crypto_config_current_platform_public_include_dirs += crypto_config_linux_armv4_public_include_dirs + crypto_config_current_platform_private_include_dirs += + crypto_config_linux_armv4_private_include_dirs + crypto_config_current_platform_public_include_dirs += + crypto_config_linux_armv4_public_include_dirs crypto_config_current_platform_cflags += crypto_config_linux_armv4_cflags } else if (current_cpu == "arm64" && - !(current_os == "linux" || host_os == "mac")) { + !(current_os == "linux" || host_os == "mac")) { print("openssl selected linux-aarch64") - crypto_config_current_platform_private_include_dirs += crypto_config_linux_aarch64_private_include_dirs - crypto_config_current_platform_public_include_dirs += crypto_config_linux_aarch64_public_include_dirs + crypto_config_current_platform_private_include_dirs += + crypto_config_linux_aarch64_private_include_dirs + crypto_config_current_platform_public_include_dirs += + crypto_config_linux_aarch64_public_include_dirs crypto_config_current_platform_cflags += crypto_config_linux_aarch64_cflags } else if (current_cpu == "x64" && current_os != "mingw") { print("openssl selected linux-x86_64") - crypto_config_current_platform_private_include_dirs += crypto_config_linux_x86_64_private_include_dirs - crypto_config_current_platform_public_include_dirs += crypto_config_linux_x86_64_public_include_dirs + crypto_config_current_platform_private_include_dirs += + crypto_config_linux_x86_64_private_include_dirs + crypto_config_current_platform_public_include_dirs += + crypto_config_linux_x86_64_public_include_dirs crypto_config_current_platform_cflags += crypto_config_linux_x86_64_cflags } else if (is_mingw) { print("openssl selected mingw64") - crypto_config_current_platform_private_include_dirs += crypto_config_mingw64_private_include_dirs - crypto_config_current_platform_public_include_dirs += crypto_config_mingw64_public_include_dirs + crypto_config_current_platform_private_include_dirs += + crypto_config_mingw64_private_include_dirs + crypto_config_current_platform_public_include_dirs += + crypto_config_mingw64_public_include_dirs crypto_config_current_platform_cflags += crypto_config_mingw64_cflags } print("openssl detecting os done...") config("crypto_config_private") { - include_dirs = crypto_config_common_private_include_dirs + crypto_config_current_platform_private_include_dirs - cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + openssl_internal_cflags + include_dirs = crypto_config_common_private_include_dirs + + crypto_config_current_platform_private_include_dirs + cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + + openssl_internal_cflags } config("crypto_config_public") { - include_dirs = crypto_config_common_public_include_dirs + crypto_config_current_platform_public_include_dirs + include_dirs = crypto_config_common_public_include_dirs + + crypto_config_current_platform_public_include_dirs } libcommon_common_sources = [ @@ -295,11 +312,11 @@ libcommon_mingw64_sources = [ ] libdefault_common_sources = [ + "providers/common/bio_prov.c", + "providers/common/capabilities.c", "providers/common/der/der_rsa_sig.c", "providers/common/der/der_sm2_key.c", "providers/common/der/der_sm2_sig.c", - "providers/common/bio_prov.c", - "providers/common/capabilities.c", "providers/common/digest_to_nid.c", "providers/common/provider_seeding.c", "providers/common/provider_util.c", @@ -405,11 +422,11 @@ libdefault_common_sources = [ "providers/implementations/rands/drbg_hash.c", "providers/implementations/rands/drbg_hmac.c", "providers/implementations/rands/seed_src.c", - "providers/implementations/rands/test_rng.c", "providers/implementations/rands/seeding/rand_cpu_x86.c", "providers/implementations/rands/seeding/rand_tsc.c", "providers/implementations/rands/seeding/rand_unix.c", "providers/implementations/rands/seeding/rand_win.c", + "providers/implementations/rands/test_rng.c", "providers/implementations/signature/dsa_sig.c", "providers/implementations/signature/ecdsa_sig.c", "providers/implementations/signature/eddsa_sig.c", @@ -421,21 +438,17 @@ libdefault_common_sources = [ "ssl/s3_cbc.c", ] -libdefault_linux_armv4_sources = [ - "build_all_generated/linux-armv4/providers/common/der/der_sm2_gen.c", -] +libdefault_linux_armv4_sources = + [ "build_all_generated/linux-armv4/providers/common/der/der_sm2_gen.c" ] -libdefault_linux_aarch64_sources = [ - "build_all_generated/linux-aarch64/providers/common/der/der_sm2_gen.c", -] +libdefault_linux_aarch64_sources = + [ "build_all_generated/linux-aarch64/providers/common/der/der_sm2_gen.c" ] -libdefault_linux_x86_64_sources = [ - "build_all_generated/linux-x86_64/providers/common/der/der_sm2_gen.c", -] +libdefault_linux_x86_64_sources = + [ "build_all_generated/linux-x86_64/providers/common/der/der_sm2_gen.c" ] -libdefault_mingw64_sources = [ - "build_all_generated/mingw64/providers/common/der/der_sm2_gen.c", -] +libdefault_mingw64_sources = + [ "build_all_generated/mingw64/providers/common/der/der_sm2_gen.c" ] ohos_source_set("crypto_source") { sources = [ @@ -510,6 +523,7 @@ ohos_source_set("crypto_source") { "crypto/asn1/x_sig.c", "crypto/asn1/x_spki.c", "crypto/asn1/x_val.c", + "crypto/asn1_dsa.c", "crypto/async/arch/async_null.c", "crypto/async/arch/async_posix.c", "crypto/async/arch/async_win.c", @@ -580,6 +594,7 @@ ohos_source_set("crypto_source") { "crypto/bn/bn_srp.c", "crypto/bn/bn_word.c", "crypto/bn/bn_x931p.c", + "crypto/bsearch.c", "crypto/buffer/buf_err.c", "crypto/buffer/buffer.c", "crypto/camellia/cmll_cfb.c", @@ -633,10 +648,17 @@ ohos_source_set("crypto_source") { "crypto/conf/conf_mod.c", "crypto/conf/conf_sap.c", "crypto/conf/conf_ssl.c", + "crypto/context.c", + "crypto/core_algorithm.c", + "crypto/core_fetch.c", + "crypto/core_namemap.c", + "crypto/cpt_err.c", + "crypto/cpuid.c", "crypto/crmf/crmf_asn.c", "crypto/crmf/crmf_err.c", "crypto/crmf/crmf_lib.c", "crypto/crmf/crmf_pbm.c", + "crypto/cryptlib.c", "crypto/ct/ct_b64.c", "crypto/ct/ct_err.c", "crypto/ct/ct_log.c", @@ -647,6 +669,9 @@ ohos_source_set("crypto_source") { "crypto/ct/ct_sct_ctx.c", "crypto/ct/ct_vfy.c", "crypto/ct/ct_x509v3.c", + "crypto/ctype.c", + "crypto/cversion.c", + "crypto/der_writer.c", "crypto/des/cbc_cksm.c", "crypto/des/cbc_enc.c", "crypto/des/cfb64ede.c", @@ -703,6 +728,8 @@ ohos_source_set("crypto_source") { "crypto/dso/dso_openssl.c", "crypto/dso/dso_vms.c", "crypto/dso/dso_win32.c", + "crypto/ebcdic.c", + "crypto/ec/curve25519.c", "crypto/ec/curve448/arch_32/f_impl32.c", "crypto/ec/curve448/arch_64/f_impl64.c", "crypto/ec/curve448/curve448.c", @@ -710,7 +737,6 @@ ohos_source_set("crypto_source") { "crypto/ec/curve448/eddsa.c", "crypto/ec/curve448/f_generic.c", "crypto/ec/curve448/scalar.c", - "crypto/ec/curve25519.c", "crypto/ec/ec2_oct.c", "crypto/ec/ec2_smpl.c", "crypto/ec/ec_ameth.c", @@ -860,6 +886,7 @@ ohos_source_set("crypto_source") { "crypto/evp/pmeth_gn.c", "crypto/evp/pmeth_lib.c", "crypto/evp/signature.c", + "crypto/ex_data.c", "crypto/ffc/ffc_backend.c", "crypto/ffc/ffc_dh.c", "crypto/ffc/ffc_key_generate.c", @@ -867,6 +894,7 @@ ohos_source_set("crypto_source") { "crypto/ffc/ffc_params.c", "crypto/ffc/ffc_params_generate.c", "crypto/ffc/ffc_params_validate.c", + "crypto/getenv.c", "crypto/hmac/hmac.c", "crypto/http/http_client.c", "crypto/http/http_err.c", @@ -876,55 +904,12 @@ ohos_source_set("crypto_source") { "crypto/idea/i_ecb.c", "crypto/idea/i_ofb64.c", "crypto/idea/i_skey.c", - "crypto/kdf/kdf_err.c", - "crypto/lhash/lh_stats.c", - "crypto/lhash/lhash.c", - "crypto/asn1_dsa.c", - "crypto/bsearch.c", - "crypto/context.c", - "crypto/core_algorithm.c", - "crypto/core_fetch.c", - "crypto/core_namemap.c", - "crypto/cpt_err.c", - "crypto/cpuid.c", - "crypto/cryptlib.c", - "crypto/ctype.c", - "crypto/cversion.c", - "crypto/der_writer.c", - "crypto/ebcdic.c", - "crypto/ex_data.c", - "crypto/getenv.c", "crypto/info.c", "crypto/init.c", "crypto/initthread.c", - "crypto/mem.c", - "crypto/mem_sec.c", - "crypto/o_dir.c", - "crypto/o_fopen.c", - "crypto/o_init.c", - "crypto/o_str.c", - "crypto/o_time.c", - "crypto/packet.c", - "crypto/param_build.c", - "crypto/param_build_set.c", - "crypto/params.c", - "crypto/params_dup.c", - "crypto/params_from_text.c", - "crypto/passphrase.c", - "crypto/provider.c", - "crypto/provider_child.c", - "crypto/provider_conf.c", - "crypto/provider_core.c", - "crypto/provider_predefined.c", - "crypto/punycode.c", - "crypto/self_test_core.c", - "crypto/sparse_array.c", - "crypto/threads_lib.c", - "crypto/threads_none.c", - "crypto/threads_pthread.c", - "crypto/threads_win.c", - "crypto/trace.c", - "crypto/uid.c", + "crypto/kdf/kdf_err.c", + "crypto/lhash/lh_stats.c", + "crypto/lhash/lhash.c", "crypto/md4/md4_dgst.c", "crypto/md4/md4_one.c", "crypto/md5/md5_dgst.c", @@ -932,6 +917,8 @@ ohos_source_set("crypto_source") { "crypto/md5/md5_sha1.c", "crypto/mdc2/mdc2_one.c", "crypto/mdc2/mdc2dgst.c", + "crypto/mem.c", + "crypto/mem_sec.c", "crypto/modes/cbc128.c", "crypto/modes/ccm128.c", "crypto/modes/cfb128.c", @@ -943,6 +930,11 @@ ohos_source_set("crypto_source") { "crypto/modes/siv128.c", "crypto/modes/wrap128.c", "crypto/modes/xts128.c", + "crypto/o_dir.c", + "crypto/o_fopen.c", + "crypto/o_init.c", + "crypto/o_str.c", + "crypto/o_time.c", "crypto/objects/o_names.c", "crypto/objects/obj_dat.c", "crypto/objects/obj_err.c", @@ -958,6 +950,13 @@ ohos_source_set("crypto_source") { "crypto/ocsp/ocsp_srv.c", "crypto/ocsp/ocsp_vfy.c", "crypto/ocsp/v3_ocsp.c", + "crypto/packet.c", + "crypto/param_build.c", + "crypto/param_build_set.c", + "crypto/params.c", + "crypto/params_dup.c", + "crypto/params_from_text.c", + "crypto/passphrase.c", "crypto/pem/pem_all.c", "crypto/pem/pem_err.c", "crypto/pem/pem_info.c", @@ -1000,6 +999,12 @@ ohos_source_set("crypto_source") { "crypto/property/property_parse.c", "crypto/property/property_query.c", "crypto/property/property_string.c", + "crypto/provider.c", + "crypto/provider_child.c", + "crypto/provider_conf.c", + "crypto/provider_core.c", + "crypto/provider_predefined.c", + "crypto/punycode.c", "crypto/rand/prov_seed.c", "crypto/rand/rand_deprecated.c", "crypto/rand/rand_err.c", @@ -1045,6 +1050,7 @@ ohos_source_set("crypto_source") { "crypto/seed/seed_cfb.c", "crypto/seed/seed_ecb.c", "crypto/seed/seed_ofb.c", + "crypto/self_test_core.c", "crypto/sha/sha1_one.c", "crypto/sha/sha1dgst.c", "crypto/sha/sha256.c", @@ -1058,6 +1064,7 @@ ohos_source_set("crypto_source") { "crypto/sm3/legacy_sm3.c", "crypto/sm3/sm3.c", "crypto/sm4/sm4.c", + "crypto/sparse_array.c", "crypto/srp/srp_lib.c", "crypto/srp/srp_vfy.c", "crypto/stack/stack.c", @@ -1068,6 +1075,11 @@ ohos_source_set("crypto_source") { "crypto/store/store_register.c", "crypto/store/store_result.c", "crypto/store/store_strings.c", + "crypto/threads_lib.c", + "crypto/threads_none.c", + "crypto/threads_pthread.c", + "crypto/threads_win.c", + "crypto/trace.c", "crypto/ts/ts_asn1.c", "crypto/ts/ts_conf.c", "crypto/ts/ts_err.c", @@ -1085,6 +1097,7 @@ ohos_source_set("crypto_source") { "crypto/ui/ui_null.c", "crypto/ui/ui_openssl.c", "crypto/ui/ui_util.c", + "crypto/uid.c", "crypto/whrlpool/wp_dgst.c", "crypto/x509/by_dir.c", "crypto/x509/by_file.c", @@ -1174,22 +1187,14 @@ ohos_source_set("crypto_source") { sources += libcommon_linux_armv4_sources sources += libdefault_linux_armv4_sources sources += [ - "crypto/aes/aes_cbc.c", - "crypto/bn/bn_asm.c", - "crypto/camellia/camellia.c", - "crypto/camellia/cmll_cbc.c", - "crypto/armcap.c", - "crypto/rc4/rc4_enc.c", - "crypto/rc4/rc4_skey.c", - "crypto/whrlpool/wp_block.c", "build_all_generated/linux-armv4/crypto/aes/aes-armv4.S", "build_all_generated/linux-armv4/crypto/aes/aesv8-armx.S", "build_all_generated/linux-armv4/crypto/aes/bsaes-armv7.S", + "build_all_generated/linux-armv4/crypto/armv4cpuid.S", "build_all_generated/linux-armv4/crypto/bn/armv4-gf2m.S", "build_all_generated/linux-armv4/crypto/bn/armv4-mont.S", "build_all_generated/linux-armv4/crypto/chacha/chacha-armv4.S", "build_all_generated/linux-armv4/crypto/ec/ecp_nistz256-armv4.S", - "build_all_generated/linux-armv4/crypto/armv4cpuid.S", "build_all_generated/linux-armv4/crypto/modes/ghash-armv4.S", "build_all_generated/linux-armv4/crypto/modes/ghashv8-armx.S", "build_all_generated/linux-armv4/crypto/poly1305/poly1305-armv4.S", @@ -1197,21 +1202,20 @@ ohos_source_set("crypto_source") { "build_all_generated/linux-armv4/crypto/sha/sha1-armv4-large.S", "build_all_generated/linux-armv4/crypto/sha/sha256-armv4.S", "build_all_generated/linux-armv4/crypto/sha/sha512-armv4.S", - ] - } else if (current_cpu == "arm64" && - !(current_os == "linux" || host_os == "mac")) { - sources += libcommon_linux_aarch64_sources - sources += libdefault_linux_aarch64_sources - sources += [ "crypto/aes/aes_cbc.c", - "crypto/aes/aes_core.c", + "crypto/armcap.c", "crypto/bn/bn_asm.c", "crypto/camellia/camellia.c", "crypto/camellia/cmll_cbc.c", - "crypto/armcap.c", "crypto/rc4/rc4_enc.c", "crypto/rc4/rc4_skey.c", "crypto/whrlpool/wp_block.c", + ] + } else if (current_cpu == "arm64" && + !(current_os == "linux" || host_os == "mac")) { + sources += libcommon_linux_aarch64_sources + sources += libdefault_linux_aarch64_sources + sources += [ "build_all_generated/linux-aarch64/crypto/aes/aesv8-armx.S", "build_all_generated/linux-aarch64/crypto/aes/vpaes-armv8.S", "build_all_generated/linux-aarch64/crypto/arm64cpuid.S", @@ -1225,14 +1229,20 @@ ohos_source_set("crypto_source") { "build_all_generated/linux-aarch64/crypto/sha/sha1-armv8.S", "build_all_generated/linux-aarch64/crypto/sha/sha256-armv8.S", "build_all_generated/linux-aarch64/crypto/sha/sha512-armv8.S", + "crypto/aes/aes_cbc.c", + "crypto/aes/aes_core.c", + "crypto/armcap.c", + "crypto/bn/bn_asm.c", + "crypto/camellia/camellia.c", + "crypto/camellia/cmll_cbc.c", + "crypto/rc4/rc4_enc.c", + "crypto/rc4/rc4_skey.c", + "crypto/whrlpool/wp_block.c", ] } else if (current_cpu == "x64" && current_os != "mingw") { sources += libcommon_linux_x86_64_sources sources += libdefault_linux_x86_64_sources sources += [ - "crypto/bn/asm/x86_64-gcc.c", - "crypto/bn/rsaz_exp.c", - "crypto/bn/rsaz_exp_x2.c", "build_all_generated/linux-x86_64/crypto/aes/aes-x86_64.s", "build_all_generated/linux-x86_64/crypto/aes/aesni-mb-x86_64.s", "build_all_generated/linux-x86_64/crypto/aes/aesni-sha1-x86_64.s", @@ -1264,15 +1274,14 @@ ohos_source_set("crypto_source") { "build_all_generated/linux-x86_64/crypto/sha/sha512-x86_64.s", "build_all_generated/linux-x86_64/crypto/whrlpool/wp-x86_64.s", "build_all_generated/linux-x86_64/crypto/x86_64cpuid.s", + "crypto/bn/asm/x86_64-gcc.c", + "crypto/bn/rsaz_exp.c", + "crypto/bn/rsaz_exp_x2.c", ] } else if (is_mingw) { sources += libcommon_mingw64_sources sources += libdefault_mingw64_sources sources += [ - "crypto/bn/asm/x86_64-gcc.c", - "crypto/bn/rsaz_exp.c", - "crypto/bn/rsaz_exp_x2.c", - "crypto/dllmain.c", "build_all_generated/mingw64/crypto/aes/aes-x86_64.s", "build_all_generated/mingw64/crypto/aes/aesni-mb-x86_64.s", "build_all_generated/mingw64/crypto/aes/aesni-sha1-x86_64.s", @@ -1290,7 +1299,6 @@ ohos_source_set("crypto_source") { "build_all_generated/mingw64/crypto/chacha/chacha-x86_64.s", "build_all_generated/mingw64/crypto/ec/ecp_nistz256-x86_64.s", "build_all_generated/mingw64/crypto/ec/x25519-x86_64.s", - "build_all_generated/mingw64/crypto/x86_64cpuid.s", "build_all_generated/mingw64/crypto/md5/md5-x86_64.s", "build_all_generated/mingw64/crypto/modes/aesni-gcm-x86_64.s", "build_all_generated/mingw64/crypto/modes/ghash-x86_64.s", @@ -1304,6 +1312,11 @@ ohos_source_set("crypto_source") { "build_all_generated/mingw64/crypto/sha/sha256-x86_64.s", "build_all_generated/mingw64/crypto/sha/sha512-x86_64.s", "build_all_generated/mingw64/crypto/whrlpool/wp-x86_64.s", + "build_all_generated/mingw64/crypto/x86_64cpuid.s", + "crypto/bn/asm/x86_64-gcc.c", + "crypto/bn/rsaz_exp.c", + "crypto/bn/rsaz_exp_x2.c", + "crypto/dllmain.c", ] } @@ -1379,12 +1392,15 @@ unused_variables += libdefault_linux_x86_64_sources unused_variables += libdefault_mingw64_sources config("ssl_config") { - include_dirs = crypto_config_common_private_include_dirs + crypto_config_current_platform_private_include_dirs - cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + openssl_internal_cflags + include_dirs = crypto_config_common_private_include_dirs + + crypto_config_current_platform_private_include_dirs + cflags = crypto_config_common_cflags + crypto_config_current_platform_cflags + + openssl_internal_cflags } config("ssl_config_public") { - include_dirs = crypto_config_common_public_include_dirs + crypto_config_current_platform_public_include_dirs + include_dirs = crypto_config_common_public_include_dirs + + crypto_config_current_platform_public_include_dirs } ohos_source_set("ssl_source") { @@ -1395,6 +1411,13 @@ ohos_source_set("ssl_source") { "ssl/d1_srtp.c", "ssl/methods.c", "ssl/pqueue.c", + "ssl/record/dtls1_bitmap.c", + "ssl/record/rec_layer_d1.c", + "ssl/record/rec_layer_s3.c", + "ssl/record/ssl3_buffer.c", + "ssl/record/ssl3_record.c", + "ssl/record/ssl3_record_tls13.c", + # ssl/s3_cbc.c has been added into libdefault_common_sources "ssl/s3_enc.c", "ssl/s3_lib.c", @@ -1414,18 +1437,7 @@ ohos_source_set("ssl_source") { "ssl/ssl_stat.c", "ssl/ssl_txt.c", "ssl/ssl_utst.c", - "ssl/t1_enc.c", - "ssl/t1_lib.c", - "ssl/t1_trce.c", - "ssl/tls13_enc.c", - "ssl/tls_depr.c", - "ssl/tls_srp.c", - "ssl/record/dtls1_bitmap.c", - "ssl/record/rec_layer_d1.c", - "ssl/record/rec_layer_s3.c", - "ssl/record/ssl3_buffer.c", - "ssl/record/ssl3_record.c", - "ssl/record/ssl3_record_tls13.c", + # ssl/record/tls_pad.c has been added into libcommon_common_sources "ssl/statem/extensions.c", "ssl/statem/extensions_clnt.c", @@ -1436,6 +1448,12 @@ ohos_source_set("ssl_source") { "ssl/statem/statem_dtls.c", "ssl/statem/statem_lib.c", "ssl/statem/statem_srvr.c", + "ssl/t1_enc.c", + "ssl/t1_lib.c", + "ssl/t1_trce.c", + "ssl/tls13_enc.c", + "ssl/tls_depr.c", + "ssl/tls_srp.c", ] configs = [ ":ssl_config" ] @@ -1443,17 +1461,15 @@ ohos_source_set("ssl_source") { } ohos_static_library("libssl_static") { - deps = [ - ":ssl_source", - ] + deps = [ ":ssl_source" ] public_configs = [ ":ssl_config_public" ] complete_static_lib = true } ohos_shared_library("libssl_shared") { deps = [ - ":ssl_source", ":libcrypto_shared", + ":ssl_source", ] if (is_mingw) { -- GitLab