hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

upgrade libcurl version and use openssl 1.1.e

Browse Source
This commit is contained in:
496148326@qq.com
2023-09-22 12:43:55 +00:00
committed by ob-robot
parent 07ecec736f
commit a41ae44f1b
10 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deps/easy/src/io/easy_ssl.c vendored
View File

@ -1824,16 +1824,6 @@ static int easy_ssl_dhparam(easy_ssl_ctx_t *ssl, char *file)
return EASY_ERROR;
}
#ifndef OB_USE_BABASSL
dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
if (NULL == dh->p || NULL == dh->g) {
easy_ssl_error(EASY_LOG_ERROR, "BN_bin2bn() failed");
DH_free(dh);
return EASY_ERROR;
}
#else
if (1 != DH_set0_pqg(dh, BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL), NULL, NULL)) {
easy_ssl_error(EASY_LOG_ERROR, "BN_bin2bn() failed");
DH_free(dh);
@ -1844,7 +1834,7 @@ static int easy_ssl_dhparam(easy_ssl_ctx_t *ssl, char *file)
DH_free(dh);
return EASY_ERROR;
}
#endif
SSL_CTX_set_tmp_dh(ssl->ctx, dh);
DH_free(dh);

6
deps/init/oceanbase.el7.aarch64.deps vendored
View File

@ -11,11 +11,11 @@ repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/aarch64/
[deps]
devdeps-gtest-1.8.0-132022101316.el7.aarch64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el7.aarch64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el7.aarch64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el7.aarch64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el7.aarch64.rpm
devdeps-libaio-0.3.112-12022092915.el7.aarch64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el7.aarch64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el7.aarch64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el7.aarch64.rpm
devdeps-libxml2-2.10.4-42023082915.el7.aarch64.rpm
devdeps-mxml-2.12.0-12022090616.el7.aarch64.rpm
devdeps-apr-1.6.5-32022090616.el7.aarch64.rpm
@ -25,7 +25,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el7.aarch64.rpm
devdeps-zlib-static-1.2.7-132022100815.el7.aarch64.rpm
devdeps-ncurses-static-6.2-72022100815.el7.aarch64.rpm
devdeps-boost-1.74.0-22022110914.el7.aarch64.rpm
devdeps-s2geometry-0.9.0-42022111116.el7.aarch64.rpm
devdeps-s2geometry-0.9.0-12023092021.el7.aarch64.rpm
devdeps-icu-69.1-72022112416.el7.aarch64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el7.aarch64.rpm

6
deps/init/oceanbase.el7.x86_64.deps vendored
View File

@ -12,12 +12,12 @@ repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el7.x86_64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el7.x86_64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el7.x86_64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el7.x86_64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el7.x86_64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el7.x86_64.rpm
devdeps-libaio-0.3.112-12022092915.el7.x86_64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el7.x86_64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el7.x86_64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el7.x86_64.rpm
devdeps-libxml2-2.10.4-42023082915.el7.x86_64.rpm
devdeps-mxml-2.12.0-12022090616.el7.x86_64.rpm
devdeps-apr-1.6.5-32022090616.el7.x86_64.rpm
@ -27,7 +27,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el7.x86_64.rpm
devdeps-zlib-static-1.2.7-132022100815.el7.x86_64.rpm
devdeps-ncurses-static-6.2-72022100815.el7.x86_64.rpm
devdeps-boost-1.74.0-22022110914.el7.x86_64.rpm
devdeps-s2geometry-0.9.0-42022111116.el7.x86_64.rpm
devdeps-s2geometry-0.9.0-12023092021.el7.x86_64.rpm
devdeps-icu-69.1-72022112416.el7.x86_64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el7.x86_64.rpm

6
deps/init/oceanbase.el8.aarch64.deps vendored
View File

@ -11,11 +11,11 @@ repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/aarch64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.aarch64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.aarch64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el8.aarch64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el8.aarch64.rpm
devdeps-libaio-0.3.112-12022092915.el8.aarch64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el8.aarch64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el8.aarch64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el8.aarch64.rpm
devdeps-libxml2-2.10.4-42023082915.el8.aarch64.rpm
devdeps-mxml-2.12.0-12022090616.el8.aarch64.rpm
devdeps-apr-1.6.5-32022090616.el8.aarch64.rpm
@ -25,7 +25,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el8.aarch64.rpm
devdeps-zlib-static-1.2.7-132022100815.el8.aarch64.rpm
devdeps-ncurses-static-6.2-72022100815.el8.aarch64.rpm
devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
devdeps-s2geometry-0.9.0-42022111116.el8.aarch64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
devdeps-icu-69.1-72022112416.el8.aarch64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el8.aarch64.rpm

6
deps/init/oceanbase.el8.x86_64.deps vendored
View File

@ -11,12 +11,12 @@ repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.x86_64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.x86_64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el8.x86_64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el8.x86_64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el8.x86_64.rpm
devdeps-libaio-0.3.112-12022092915.el8.x86_64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el8.x86_64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el8.x86_64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el8.x86_64.rpm
devdeps-libxml2-2.10.4-42023082915.el8.x86_64.rpm
devdeps-mxml-2.12.0-12022090616.el8.x86_64.rpm
devdeps-apr-1.6.5-32022090616.el8.x86_64.rpm
@ -26,7 +26,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el8.x86_64.rpm
devdeps-zlib-static-1.2.7-132022100815.el8.x86_64.rpm
devdeps-ncurses-static-6.2-72022100815.el8.x86_64.rpm
devdeps-boost-1.74.0-22022110914.el8.x86_64.rpm
devdeps-s2geometry-0.9.0-42022111116.el8.x86_64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.x86_64.rpm
devdeps-icu-69.1-72022112416.el8.x86_64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el8.x86_64.rpm

6
deps/init/oceanbase.el9.aarch64.deps vendored
View File

@ -16,11 +16,11 @@ repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/aarch64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.aarch64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.aarch64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el8.aarch64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el8.aarch64.rpm
devdeps-libaio-0.3.112-12022092915.el8.aarch64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el8.aarch64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el8.aarch64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el8.aarch64.rpm
devdeps-libxml2-2.10.4-42023082915.el8.aarch64.rpm
devdeps-mxml-2.12.0-12022090616.el8.aarch64.rpm
devdeps-xz-5.2.2-42022090615.el8.aarch64.rpm
@ -29,7 +29,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el8.aarch64.rpm
devdeps-zlib-static-1.2.7-132022100815.el8.aarch64.rpm
devdeps-ncurses-static-6.2-72022100815.el8.aarch64.rpm
devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
devdeps-s2geometry-0.9.0-42022111116.el8.aarch64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
devdeps-icu-69.1-72022112416.el8.aarch64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el8.aarch64.rpm

6
deps/init/oceanbase.el9.x86_64.deps vendored
View File

@ -16,12 +16,12 @@ repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.x86_64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.x86_64.rpm
devdeps-libcurl-static-8.2.1-172023092015.el8.x86_64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el8.x86_64.rpm
devdeps-mariadb-connector-c-3.1.12-12022100422.el8.x86_64.rpm
devdeps-libaio-0.3.112-12022092915.el8.x86_64.rpm
devdeps-relaxed-rapidjson-1.0.0-52023011719.el8.x86_64.rpm
devdeps-openssl-static-1.0.1e-12022100422.el8.x86_64.rpm
devdeps-openssl-static-1.1.1e-12023091810.el8.x86_64.rpm
devdeps-libxml2-2.10.4-42023082915.el8.x86_64.rpm
devdeps-mxml-2.12.0-12022090616.el8.x86_64.rpm
devdeps-xz-5.2.2-42022090615.el8.x86_64.rpm
@ -30,7 +30,7 @@ devdeps-oss-c-sdk-3.9.2-182022100412.el8.x86_64.rpm
devdeps-zlib-static-1.2.7-132022100815.el8.x86_64.rpm
devdeps-ncurses-static-6.2-72022100815.el8.x86_64.rpm
devdeps-boost-1.74.0-22022110914.el8.x86_64.rpm
devdeps-s2geometry-0.9.0-42022111116.el8.x86_64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.x86_64.rpm
devdeps-icu-69.1-72022112416.el8.x86_64.rpm
devdeps-cos-c-sdk-5.0.16-52023070517.el8.x86_64.rpm

6
deps/oblib/src/CMakeLists.txt vendored
View File

@ -195,6 +195,7 @@ target_link_libraries(oblib_base_base_base
oss
easy
${DEP_DIR}/lib/libisal.a
${DEP_DIR}/lib/libcurl.a
${DEP_DIR}/lib/libssl.a
${DEP_DIR}/lib/libcrypto.a
${DEP_DIR}/lib/libs2.a
@ -209,7 +210,7 @@ target_link_libraries(oblib_base_base_base
-L${DEP_DIR}/var/usr/lib
-L${DEP_3RD_DIR}/usr/lib
-L${DEP_3RD_DIR}/usr/lib64
-laio -lpthread -lcurl -ldl -lrt
-laio -lpthread -ldl -lrt
${ARCH_LDFLAGS}
)
else()
@ -220,6 +221,7 @@ target_link_libraries(oblib_base_base_base
easy
${DEP_DIR}/lib/libisal.a
$<$<STREQUAL:"${ARCHITECTURE}","x86_64">:${DEP_DIR}/lib/libunwind.a>
${DEP_DIR}/lib/libcurl.a
${DEP_3RD_DIR}/usr/local/babassl-ob/lib/libssl.a
${DEP_3RD_DIR}/usr/local/babassl-ob/lib/libcrypto.a
${DEP_3RD_DIR}/u01/obclient/lib/libobclnt.a
@ -232,7 +234,7 @@ target_link_libraries(oblib_base_base_base
-L${DEP_DIR}/var/usr/lib
-L${DEP_3RD_DIR}/usr/lib
-L${DEP_3RD_DIR}/usr/lib64
-laio -lpthread -lcurl -ldl -lrt
-laio -lpthread -ldl -lrt
${ARCH_LDFLAGS}
)
endif()

4
src/libtable/examples/example_makefile.mk
View File

@ -3,7 +3,7 @@ all: pstore_example_d pstore_example_s
OBINSTALLDIR=/tmpfs/zhuweng.yzf/home/admin/oceanbase/
DEP_DIR=/home/zhuweng.yzf/myWorkspace/oceanbase/rpm/.dep_create
OSS_DIR=/home/zhuweng.yzf/myWorkspace/oceanbase/src/library/src/lib/restore/oss/
LIBS=-l:libvsclient.a -l:liboss_c_sdk.a -l:libaprutil-1.a -l:libapr-1.a -l:libmxml.a -l:libeasy.a -lpthread -lc -lm -lrt -ldl -laio -lcurl -lssl -lcrypt
LIBS=-l:libvsclient.a -l:liboss_c_sdk.a -l:libaprutil-1.a -l:libapr-1.a -l:libmxml.a -l:libeasy.a -lpthread -lc -lm -lrt -ldl -laio -l:libcurl.a -lssl -lcrypt
LDFLAGS=-L/usr/lib64/ -L$(OBINSTALLDIR)/lib -L$(DEP_DIR)/lib -L$(OSS_DIR)/lib
CPPFLAGS=-I$(OBINSTALLDIR)/include -I$(OBINSTALLDIR)/include/easy -I${DEP_DIR}/include -I${DEP_DIR}/include/mysql
@ -15,7 +15,7 @@ pstore_example_d: ob_pstore_example.o
pstore_example_s_LDADD= -l:libeasy.a -l:libobtable.a -l:libeasy.a -l:libvsclient.a -l:liboss_c_sdk.a -l:libaprutil-1.a -l:libapr-1.a -l:libmxml.a
pstore_example_s: ob_pstore_example.o
$(CXX) -v $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(pstore_example_s_LDADD) -lpthread -laio -lssl -lcrypt -lcrypto -lcurl -lrt -lmysqlclient_r -ldl
$(CXX) -v $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(pstore_example_s_LDADD) -lpthread -laio -lssl -lcrypt -lcrypto -l:libcurl.a -lrt -lmysqlclient_r -ldl

22
src/share/ob_encryption_util_os.cpp
View File

@ -330,27 +330,6 @@ int ObBlockCipher::decrypt(const char *key, const int64_t key_len,
return ret;
}
#ifndef OB_USE_BABASSL
static void* ob_malloc_openssl(size_t nbytes)
{
ObMemAttr attr;
attr.label_ = ObModIds::OB_BUFFER;
return ob_malloc(nbytes, attr);
}
static void* ob_realloc_openssl(void *ptr, size_t nbytes)
{
ObMemAttr attr;
attr.label_ = ObModIds::OB_BUFFER;
return ob_realloc(ptr, nbytes, attr);
}
static void ob_free_openssl(void *ptr)
{
ob_free(ptr);
}
#else
static void* ob_malloc_openssl(size_t nbyte, const char *, int)
{
ObMemAttr attr;
@ -369,7 +348,6 @@ static void ob_free_openssl(void *ptr, const char *, int)
{
ob_free(ptr);
}
#endif
int ObEncryptionUtil::init_ssl_malloc()
{