mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
f5056577ba
DES, idea, seed, rc2, rc4, rc5, cast and blowfish have been moved out of the default provider. Code shared between desx and tdes has been moved into a seperate file (cipher_tdes_common.c). 3 test recipes failed due to using app/openssl calls that used legacy ciphers. These calls have been updated to supply both the default and legacy providers. Fixed openssl app '-provider' memory leak Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11419)
75 lines
1.8 KiB
C
75 lines
1.8 KiB
C
/*
|
|
* Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "apps.h"
|
|
#include <openssl/err.h>
|
|
#include <openssl/provider.h>
|
|
#include <openssl/safestack.h>
|
|
|
|
DEFINE_STACK_OF(OSSL_PROVIDER)
|
|
|
|
/*
|
|
* See comments in opt_verify for explanation of this.
|
|
*/
|
|
enum prov_range { OPT_PROV_ENUM };
|
|
|
|
static STACK_OF(OSSL_PROVIDER) *app_providers = NULL;
|
|
|
|
static int opt_provider_load(const char *provider)
|
|
{
|
|
OSSL_PROVIDER *prov;
|
|
|
|
prov = OSSL_PROVIDER_load(NULL, provider);
|
|
if (prov == NULL) {
|
|
opt_printf_stderr("%s: unable to load provider %s\n",
|
|
opt_getprog(), provider);
|
|
return 0;
|
|
}
|
|
if (app_providers == NULL)
|
|
app_providers = sk_OSSL_PROVIDER_new_null();
|
|
if (app_providers == NULL
|
|
|| !sk_OSSL_PROVIDER_push(app_providers, prov)) {
|
|
app_providers_cleanup();
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void provider_free(OSSL_PROVIDER *prov)
|
|
{
|
|
OSSL_PROVIDER_unload(prov);
|
|
}
|
|
|
|
void app_providers_cleanup(void)
|
|
{
|
|
sk_OSSL_PROVIDER_pop_free(app_providers, provider_free);
|
|
app_providers = NULL;
|
|
}
|
|
|
|
static int opt_provider_path(const char *path)
|
|
{
|
|
if (path != NULL && *path == '\0')
|
|
path = NULL;
|
|
return OSSL_PROVIDER_set_default_search_path(NULL, path);
|
|
}
|
|
|
|
int opt_provider(int opt)
|
|
{
|
|
switch ((enum prov_range)opt) {
|
|
case OPT_PROV__FIRST:
|
|
case OPT_PROV__LAST:
|
|
return 1;
|
|
case OPT_PROV_PROVIDER:
|
|
return opt_provider_load(opt_arg());
|
|
case OPT_PROV_PROVIDER_PATH:
|
|
return opt_provider_path(opt_arg());
|
|
}
|
|
return 0;
|
|
}
|