Commit 4fd39122 authored by Richard Levitte's avatar Richard Levitte
Browse files

OSSL_STORE: Add OSSL_STORE_vctrl() 



It's a convenient complement to OSSL_STORE_ctrl()

Suggested by Norm Green

Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5363)
parent 87e17dc5

crypto/store/store_lib.c

+9 −3
Original line number Diff line number Diff line
@@ -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;

include/openssl/store.h

+1 −0
Original line number Diff line number Diff line
@@ -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.

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -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: