projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SM4 optimization for ARM by HW instruction
[openssl.git]
/
apps
/
kdf.c
diff --git
a/apps/kdf.c
b/apps/kdf.c
index 7b016051f1fdbcdedf8476a348f7a51792c88b60..89ee1f69c7669ff85263e0bd1a7f299103008ee9 100644
(file)
--- a/
apps/kdf.c
+++ b/
apps/kdf.c
@@
-52,13
+52,14
@@
static char *alloc_kdf_algorithm_name(STACK_OF(OPENSSL_STRING) **optp,
const char *name, const char *arg)
{
size_t len = strlen(name) + strlen(arg) + 2;
const char *name, const char *arg)
{
size_t len = strlen(name) + strlen(arg) + 2;
- char *res
= app_malloc(len, "algorithm name")
;
+ char *res;
if (*optp == NULL)
*optp = sk_OPENSSL_STRING_new_null();
if (*optp == NULL)
return NULL;
if (*optp == NULL)
*optp = sk_OPENSSL_STRING_new_null();
if (*optp == NULL)
return NULL;
+ res = app_malloc(len, "algorithm name");
BIO_snprintf(res, len, "%s:%s", name, arg);
if (sk_OPENSSL_STRING_push(*optp, res))
return res;
BIO_snprintf(res, len, "%s:%s", name, arg);
if (sk_OPENSSL_STRING_push(*optp, res))
return res;
@@
-137,7
+138,8
@@
opthelp:
if (argc != 1)
goto opthelp;
if (argc != 1)
goto opthelp;
- if ((kdf = EVP_KDF_fetch(NULL, argv[0], NULL)) == NULL) {
+ if ((kdf = EVP_KDF_fetch(app_get0_libctx(), argv[0],
+ app_get0_propq())) == NULL) {
BIO_printf(bio_err, "Invalid KDF name %s\n", argv[0]);
goto opthelp;
}
BIO_printf(bio_err, "Invalid KDF name %s\n", argv[0]);
goto opthelp;
}