upgrade libcurl version and use openssl 1.1.e

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

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