VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-09 09:34:49 +09:00
Code Activity

Add dynamic shim for SSL_CTX_set_options and SSL_set_options

Browse source 
This works around ABI breaking change made between OpenSSL 1.1 and 3.0 where argument type and return type was changed from unsigned long to uint64_t, which caused issues on arm32 architectures with OpenSSL 3.0 installed.

Co-authored-by: Jeremy Barton <jbarton@microsoft.com>
Co-authored-by: Tomas Weinfurt <tweinfurt@yahoo.com>
This commit is contained in:
Radek Zikmund 2022-03-25 01:30:08 +01:00 • committed by GitHub
parent 3b17fb8c99
commit aea7c73b6b
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/native/libs/System.Security.Cryptography.Native/pal_ssl.c
View file

@ -38,6 +38,53 @@ static void EnsureLibSsl10Initialized()
}
#endif
#ifdef FEATURE_DISTRO_AGNOSTIC_SSL
// redirect all SSL_CTX_set_options and SSL_set_options calls via dynamic shims
// to work around ABI breaking change between 1.1 and 3.0
#undef SSL_CTX_set_options
#define SSL_CTX_set_options SSL_CTX_set_options_dynamic
static uint64_t SSL_CTX_set_options_dynamic(SSL_CTX* ctx, uint64_t options)
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-function-type"
if (API_EXISTS(ERR_new)) // OpenSSL 3.0 sentinel function
{
// OpenSSL 3.0 and newer, use uint64_t for options
uint64_t (*func)(SSL_CTX* ctx, uint64_t op) = (uint64_t(*)(SSL_CTX*, uint64_t))SSL_CTX_set_options_ptr;
return func(ctx, options);
}
else
{
// OpenSSL 1.1 and earlier, use uint32_t for options
uint32_t (*func)(SSL_CTX* ctx, uint32_t op) = (uint32_t(*)(SSL_CTX*, uint32_t))SSL_CTX_set_options_ptr;
return func(ctx, (uint32_t)options);
}
#pragma clang diagnostic pop
}
#undef SSL_set_options
#define SSL_set_options SSL_set_options_dynamic
static uint64_t SSL_set_options_dynamic(SSL* s, uint64_t options)
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-function-type"
if (API_EXISTS(ERR_new)) // OpenSSL 3.0 sentinel function
{
// OpenSSL 3.0 and newer, use uint64_t for options
uint64_t (*func)(SSL* s, uint64_t op) = (uint64_t(*)(SSL*, uint64_t))SSL_set_options_ptr;
return func(s, options);
}
else
{
// OpenSSL 1.1 and earlier, use uint32_t for options
uint32_t (*func)(SSL* s, uint32_t op) = (uint32_t(*)(SSL*, uint32_t))SSL_set_options_ptr;
return func(s, (uint32_t)options);
}
#pragma clang diagnostic pop
}
#endif
static int32_t g_config_specified_ciphersuites = 0;
static char* g_emptyAlpn = "";