提交 4fd39122 编写于 作者: R Richard Levitte

OSSL_STORE: Add OSSL_STORE_vctrl()

It's a convenient complement to OSSL_STORE_ctrl()

Suggested by Norm Green
Reviewed-by: NMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5363)
上级 87e17dc5
...@@ -109,16 +109,22 @@ OSSL_STORE_CTX *OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method, ...@@ -109,16 +109,22 @@ OSSL_STORE_CTX *OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method,
int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd, ...) int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd, ...)
{ {
va_list args; va_list args;
int ret = 0; int ret;
va_start(args, cmd); va_start(args, cmd);
if (ctx->loader->ctrl != NULL) ret = OSSL_STORE_vctrl(ctx, cmd, args);
ret = ctx->loader->ctrl(ctx->loader_ctx, cmd, args);
va_end(args); va_end(args);
return ret; return ret;
} }
int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd, va_list args)
{
if (ctx->loader->ctrl != NULL)
return ctx->loader->ctrl(ctx->loader_ctx, cmd, args);
return 0;
}
OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx) OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
{ {
OSSL_STORE_INFO *v = NULL; OSSL_STORE_INFO *v = NULL;
......
...@@ -58,6 +58,7 @@ OSSL_STORE_CTX *OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method, ...@@ -58,6 +58,7 @@ OSSL_STORE_CTX *OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method,
* Each command takes different arguments. * Each command takes different arguments.
*/ */
int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd, ... /* args */); int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd, ... /* args */);
int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd, va_list args);
/* /*
* Common ctrl commands that different loaders may choose to support. * Common ctrl commands that different loaders may choose to support.
......
...@@ -4505,3 +4505,4 @@ RAND_DRBG_lock 4446 1_1_1 EXIST::FUNCTION: ...@@ -4505,3 +4505,4 @@ RAND_DRBG_lock 4446 1_1_1 EXIST::FUNCTION:
RAND_DRBG_unlock 4447 1_1_1 EXIST::FUNCTION: RAND_DRBG_unlock 4447 1_1_1 EXIST::FUNCTION:
RAND_DRBG_enable_locking 4448 1_1_1 EXIST::FUNCTION: RAND_DRBG_enable_locking 4448 1_1_1 EXIST::FUNCTION:
RAND_DRBG_secure_new 4449 1_1_1 EXIST::FUNCTION: RAND_DRBG_secure_new 4449 1_1_1 EXIST::FUNCTION:
OSSL_STORE_vctrl 4450 1_1_1 EXIST::FUNCTION:
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册