hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 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

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()
{