eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

OpenSSL backend: make legacy for OpenSSL3 optional and report loaded providers

Browse Source
This commit is contained in:
Milan Broz
2021-09-13 14:48:15 +02:00
parent 6c9d386303
commit 29ea07ef66
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/crypto_backend/crypto_openssl.c
View File

@@ -45,6 +45,7 @@
static OSSL_PROVIDER *ossl_legacy = NULL; static OSSL_PROVIDER *ossl_legacy = NULL;
static OSSL_PROVIDER *ossl_default = NULL; static OSSL_PROVIDER *ossl_default = NULL;
static OSSL_LIB_CTX *ossl_ctx = NULL; static OSSL_LIB_CTX *ossl_ctx = NULL;
static char backend_version[256] = "OpenSSL";
#endif #endif
#define CONST_CAST(x) (x)(uintptr_t) #define CONST_CAST(x) (x)(uintptr_t)
@@ -133,28 +134,6 @@ static void HMAC_CTX_free(HMAC_CTX *md)
free(md); free(md);
} }
#else #else
static int openssl_backend_init(void)
{
/*
* OpenSSL >= 3.0.0 provides some algorithms in legacy provider
*/
#if OPENSSL_VERSION_MAJOR >= 3
ossl_ctx = OSSL_LIB_CTX_new();
if (!ossl_ctx)
return -EINVAL;
ossl_default = OSSL_PROVIDER_try_load(ossl_ctx, "default", 0);
if (!ossl_default) {
OSSL_LIB_CTX_free(ossl_ctx);
return -EINVAL;
}
/* Optional */
ossl_legacy = OSSL_PROVIDER_try_load(ossl_ctx, "legacy", 0);
#endif
return 0;
}
static void openssl_backend_exit(void) static void openssl_backend_exit(void)
{ {
#if OPENSSL_VERSION_MAJOR >= 3 #if OPENSSL_VERSION_MAJOR >= 3
@@ -171,9 +150,46 @@ static void openssl_backend_exit(void)
#endif #endif
} }
static int openssl_backend_init(void)
{
/*
* OpenSSL >= 3.0.0 provides some algorithms in legacy provider
*/
#if OPENSSL_VERSION_MAJOR >= 3
int r;
ossl_ctx = OSSL_LIB_CTX_new();
if (!ossl_ctx)
return -EINVAL;
ossl_default = OSSL_PROVIDER_try_load(ossl_ctx, "default", 0);
if (!ossl_default) {
OSSL_LIB_CTX_free(ossl_ctx);
return -EINVAL;
}
/* Optional */
ossl_legacy = OSSL_PROVIDER_try_load(ossl_ctx, "legacy", 0);
r = snprintf(backend_version, sizeof(backend_version), "%s %s%s",
OpenSSL_version(OPENSSL_VERSION),
ossl_default ? "[default]" : "",
ossl_legacy ? "[legacy]" : "");
if (r < 0 || (size_t)r >= sizeof(backend_version)) {
openssl_backend_exit();
return -EINVAL;
}
#endif
return 0;
}
static const char *openssl_backend_version(void) static const char *openssl_backend_version(void)
{ {
#if OPENSSL_VERSION_MAJOR >= 3
return backend_version;
#else
return OpenSSL_version(OPENSSL_VERSION); return OpenSSL_version(OPENSSL_VERSION);
#endif
} }
#endif #endif