root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix DSA serializer import calls to use correct selection flags. 

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12698)
This commit is contained in:
Shane Lontis 2020-08-21 11:14:34 +10:00
parent 3fab56631f
commit 81fca0e7c1
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/implementations/encode_decode/encoder_dsa_param.c
View File

@ -63,7 +63,7 @@ static int dsa_param_der_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, params)
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS, params)
&& dsa_param_der(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -101,7 +101,7 @@ static int dsa_param_pem_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, params)
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS, params)
&& dsa_param_pem(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -138,7 +138,7 @@ static int dsa_param_print_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, params)
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS, params)
&& dsa_param_print(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);

9
providers/implementations/encode_decode/encoder_dsa_priv.c
View File

@ -25,6 +25,9 @@
#include "prov/provider_ctx.h"
#include "encoder_local.h"
#define DSA_SELECT_PRIVATE_IMPORTABLE \
(OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)
static OSSL_FUNC_encoder_newctx_fn dsa_priv_newctx;
static OSSL_FUNC_encoder_freectx_fn dsa_priv_freectx;
static OSSL_FUNC_encoder_set_ctx_params_fn dsa_priv_set_ctx_params;
@ -132,7 +135,7 @@ static int dsa_priv_der_data(void *vctx, const OSSL_PARAM params[],
DSA *dsa;
if ((dsa = dsa_new(ctx->provctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PRIVATE_IMPORTABLE, params)
&& dsa_priv_der(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -177,7 +180,7 @@ static int dsa_pem_priv_data(void *vctx, const OSSL_PARAM params[],
DSA *dsa;
if ((dsa = dsa_new(ctx->provctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PRIVATE_IMPORTABLE, params)
&& dsa_pem_priv(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -233,7 +236,7 @@ static int dsa_priv_print_data(void *vctx, const OSSL_PARAM params[],
DSA *dsa;
if ((dsa = dsa_new(ctx->provctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PRIVATE_IMPORTABLE, params)
&& dsa_priv_print(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);

10
providers/implementations/encode_decode/encoder_dsa_pub.c
View File

@ -24,13 +24,15 @@
#include "prov/provider_ctx.h"
#include "encoder_local.h"
#define DSA_SELECT_PUBLIC_IMPORTABLE \
(OSSL_KEYMGMT_SELECT_PUBLIC_KEY | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)
static OSSL_FUNC_encoder_newctx_fn dsa_pub_newctx;
static OSSL_FUNC_encoder_freectx_fn dsa_pub_freectx;
static OSSL_FUNC_encoder_encode_data_fn dsa_pub_der_data;
static OSSL_FUNC_encoder_encode_object_fn dsa_pub_der;
static OSSL_FUNC_encoder_encode_data_fn dsa_pub_pem_data;
static OSSL_FUNC_encoder_encode_object_fn dsa_pub_pem;
static OSSL_FUNC_encoder_encode_data_fn dsa_pub_print_data;
static OSSL_FUNC_encoder_encode_object_fn dsa_pub_print;
@ -63,7 +65,7 @@ static int dsa_pub_der_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PUBLIC_IMPORTABLE, params)
&& dsa_pub_der(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -114,7 +116,7 @@ static int dsa_pub_pem_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PUBLIC_IMPORTABLE, params)
&& dsa_pub_pem(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);
@ -154,7 +156,7 @@ static int dsa_pub_print_data(void *ctx, const OSSL_PARAM params[],
/* ctx == provctx */
if ((dsa = dsa_new(ctx)) != NULL
&& dsa_import(dsa, OSSL_KEYMGMT_SELECT_KEYPAIR, params)
&& dsa_import(dsa, DSA_SELECT_PUBLIC_IMPORTABLE, params)
&& dsa_pub_print(ctx, dsa, out, cb, cbarg))
ok = 1;
dsa_free(dsa);