mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

OSSL_STORE: Add OSSL_STORE_vctrl()

Browse Source 
It's a convenient complement to OSSL_STORE_ctrl()

Suggested by Norm Green

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5363)
This commit is contained in:
Richard Levitte 2018-02-14 10:28:08 +01:00
parent 87e17dc550
commit 4fd39122e5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/store/store_lib.c
View File

@ -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, ...)
{
va_list args;
int ret = 0;
int ret;
va_start(args, cmd);
if (ctx->loader->ctrl != NULL)
ret = ctx->loader->ctrl(ctx->loader_ctx, cmd, args);
ret = OSSL_STORE_vctrl(ctx, cmd, args);
va_end(args);
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 *v = NULL;

1
include/openssl/store.h
View File

@ -58,6 +58,7 @@ OSSL_STORE_CTX *OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method,
* Each command takes different arguments.
*/
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.

1
util/libcrypto.num
View File

@ -4505,3 +4505,4 @@ RAND_DRBG_lock 4446 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_secure_new 4449 1_1_1 EXIST::FUNCTION:
OSSL_STORE_vctrl 4450 1_1_1 EXIST::FUNCTION: